Commit 5c024db2 authored by Dan Carpenter's avatar Dan Carpenter Committed by Wen Zhiwei
Browse files

netfilter: nft_socket: Fix a NULL vs IS_ERR() bug in nft_socket_cgroup_subtree_level() 

stable inclusion
from stable-v6.6.53
commit 94d6fe6b6e6e1f801ead870063c8a379d3b81e4b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ0GM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=94d6fe6b6e6e1f801ead870063c8a379d3b81e4b



--------------------------------

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: default avatarDan Carpenter <dan.carpenter@linaro.org>
Acked-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Link: https://patch.msgid.link/bbc0c4e0-05cc-4f44-8797-2f4b3920a820@stanley.mountain


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent b12cd89a

net/netfilter/nft_socket.c

+2 −2
Original line number Diff line number Diff line
@@ -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;