From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sun, 25 Jun 2023 22:42:18 +0000 (+0200)
Subject: netfilter: nf_tables: unbind non-anonymous set if rule construction fails
X-Git-Tag: v6.1.39~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f145373334054a8423fac198e0dcfeeb49b96ec8;p=platform%2Fkernel%2Flinux-starfive.git

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

commit 3e70489721b6c870252c9082c496703677240f53 upstream.

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

Fixes: 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 7f71bdbc8267..5e534c9fe947 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5139,6 +5139,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;