Unverified Commit e38f2de6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12057 netfilter: nft_socket: fix sk refcount leaks 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BKYDSN7ZZJ254KMIHOH22CGQNCLE5UNC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAU9K2 
 
Link:https://gitee.com/openeuler/kernel/pulls/12057

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 457c08f3 280b5f71

net/netfilter/nft_socket.c

+4 −3
Original line number Diff line number Diff line
@@ -110,13 +110,13 @@ static void nft_socket_eval(const struct nft_expr *expr, 
			*dest = READ_ONCE(sk->sk_mark);

		} else {

			regs->verdict.code = NFT_BREAK;

			return;

			goto out_put_sk;

		}

		break;

	case NFT_SOCKET_WILDCARD:

		if (!sk_fullsock(sk)) {

			regs->verdict.code = NFT_BREAK;

			return;

			goto out_put_sk;

		}

		nft_socket_wildcard(pkt, regs, sk, dest);

		break;
@@ -124,7 +124,7 @@ static void nft_socket_eval(const struct nft_expr *expr, 
	case NFT_SOCKET_CGROUPV2:

		if (!nft_sock_get_eval_cgroupv2(dest, sk, pkt, priv->level)) {

			regs->verdict.code = NFT_BREAK;

			return;

			goto out_put_sk;

		}

		break;

#endif
@@ -133,6 +133,7 @@ static void nft_socket_eval(const struct nft_expr *expr, 
		regs->verdict.code = NFT_BREAK;

	}



out_put_sk:

	if (sk != skb->sk)

		sock_gen_put(sk);

}