Commit 2414a3ff authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Yongqiang Liu
Browse files

netfilter: nf_tables: unbind non-anonymous set if rule construction fails 

mainline inclusion
from mainline-v6.4
commit 3e704897
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7H68N
CVE: CVE-2023-3117

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3e70489721b6c870252c9082c496703677240f53



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

Otherwise a dangling reference to a rule object that is gone remains
in the set binding list.

Fixes: 26b5a571 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent b9c7440e

net/netfilter/nf_tables_api.c

+2 −0
Original line number Diff line number Diff line
@@ -3790,6 +3790,8 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, 
		nft_set_trans_unbind(ctx, set);

		if (nft_set_is_anonymous(set))

			nft_deactivate_next(ctx->net, set);

		else

			list_del_rcu(&binding->list);



		set->use--;

		break;