]> git.dujemihanovic.xyz Git - linux.git/commitdiff
netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level()
authorDan Carpenter <dan.carpenter@linaro.org>
Sat, 14 Sep 2024 09:56:51 +0000 (12:56 +0300)
committerJakub Kicinski <kuba@kernel.org>
Sun, 15 Sep 2024 15:33:12 +0000 (08:33 -0700)
The cgroup_get_from_path() function never returns NULL, it returns error
pointers.  Update the error handling to match.

Fixes: 7f3287db6543 ("netfilter: nft_socket: make cgroupsv2 matching work with namespaces")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Acked-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Link: https://patch.msgid.link/bbc0c4e0-05cc-4f44-8797-2f4b3920a820@stanley.mountain
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/netfilter/nft_socket.c

index 12cdff640492d408b33ef7c3e865126889ff1400..0a8883a93e836945b52747656c2e9c8af88c6455 100644 (file)
@@ -61,8 +61,8 @@ static noinline int nft_socket_cgroup_subtree_level(void)
        struct cgroup *cgrp = cgroup_get_from_path("/");
        int level;
 
-       if (!cgrp)
-               return -ENOENT;
+       if (IS_ERR(cgrp))
+               return PTR_ERR(cgrp);
 
        level = cgrp->level;