Commit f86fb940 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Florian Westphal
Browse files

netfilter: nf_tables: revert do not remove elements if set backend implements .abort 



nf_tables_abort_release() path calls nft_set_elem_destroy() for
NFT_MSG_NEWSETELEM which releases the element, however, a reference to
the element still remains in the working copy.

Fixes: ebd032fa ("netfilter: nf_tables: do not remove elements if set backend implements .abort")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent d111692a

net/netfilter/nf_tables_api.c

+1 −4
Original line number Diff line number Diff line
@@ -10345,10 +10345,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action) 
				break;

			}

			te = (struct nft_trans_elem *)trans->data;

			if (!te->set->ops->abort ||

			    nft_setelem_is_catchall(te->set, &te->elem))

			nft_setelem_remove(net, te->set, &te->elem);



			if (!nft_setelem_is_catchall(te->set, &te->elem))

				atomic_dec(&te->set->nelems);