Commit 72034434 authored Aug 18, 2023 by Pablo Neira Ayuso Committed by Florian Westphal Aug 23, 2023

netfilter: nf_tables: GC transaction race with abort path



Abort path is missing a synchronization point with GC transactions. Add
GC sequence number hence any GC transaction losing race will be
discarded.

Fixes: 5f68718b ("netfilter: nf_tables: GC transaction API to avoid race with control plane")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>

parent 2c9f0293

net/netfilter/nf_tables_api.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -10337,8 +10337,12 @@ static int nf_tables_abort(struct net net, struct sk_buff skb,
		enum nfnl_abort_action action)
		{
		struct nftables_pernet *nft_net = nft_pernet(net);
		int ret = __nf_tables_abort(net, action);
		unsigned int gc_seq;
		int ret;

		gc_seq = nft_gc_seq_begin(nft_net);
		ret = __nf_tables_abort(net, action);
		nft_gc_seq_end(nft_net, gc_seq);
		mutex_unlock(&nft_net->commit_mutex);

		return ret;