| Message ID | bbc0c4e0-05cc-4f44-8797-2f4b3920a820@stanley.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7052622fccb1efb850c6b55de477f65d03525a30 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level() | expand |
Dan Carpenter <dan.carpenter@linaro.org> wrote: > The cgroup_get_from_path() function never returns NULL, it returns error > pointers. Update the error handling to match. Good news, I will retire in the next few years so I don't send shit patches anymore. Acked-by: Florian Westphal <fw@strlen.de>
On Sat, Sep 14, 2024 at 01:19:40PM +0200, Florian Westphal wrote: > Dan Carpenter <dan.carpenter@linaro.org> wrote: > > The cgroup_get_from_path() function never returns NULL, it returns error > > pointers. Update the error handling to match. > > Good news, I will retire in the next few years so I don't send shit > patches anymore. > > Acked-by: Florian Westphal <fw@strlen.de> Everyone makes mistakes, don't be too hard on yourself :)
On Sat, Sep 14, 2024 at 01:19:40PM +0200, Florian Westphal wrote: > Dan Carpenter <dan.carpenter@linaro.org> wrote: > > The cgroup_get_from_path() function never returns NULL, it returns error > > pointers. Update the error handling to match. > > Good news, I will retire in the next few years so I don't send shit > patches anymore. > > Acked-by: Florian Westphal <fw@strlen.de> This is also my fault, I did not help to catch this error in any way: Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Sat, 14 Sep 2024 12:56:51 +0300 you wrote: > 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> > --- > net/netfilter/nft_socket.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - [net] netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level() https://git.kernel.org/netdev/net/c/7052622fccb1 You are awesome, thank you!
diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c index ac3c9e9cf0f3..f5da0c1775f2 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;
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> --- net/netfilter/nft_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)