diff options
| author | Dan Carpenter <dan.carpenter@linaro.org> | 2024-09-14 12:56:51 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-09-30 16:23:54 +0200 |
| commit | 8a64f87e746044e0016cc3321ae0e87a1d2b593b (patch) | |
| tree | cf8d99329927aadff5b4c78b98f65f2225ba7928 /net/netfilter | |
| parent | ace0db36b4a1db07a48517c4f04488d1cd05e5f5 (diff) | |
| download | linux-8a64f87e746044e0016cc3321ae0e87a1d2b593b.tar.gz linux-8a64f87e746044e0016cc3321ae0e87a1d2b593b.tar.bz2 linux-8a64f87e746044e0016cc3321ae0e87a1d2b593b.zip | |
netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level()
commit 7052622fccb1efb850c6b55de477f65d03525a30 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nft_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c index 8722f712c019..4148df6d6a47 100644 --- a/net/netfilter/nft_socket.c +++ b/net/netfilter/nft_socket.c @@ -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; |