Skip to content

Commit f86fb94

Browse files
ummakynesFlorian Westphal
authored andcommitted
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: ebd032f ("netfilter: nf_tables: do not remove elements if set backend implements .abort") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Florian Westphal <fw@strlen.de>
1 parent d111692 commit f86fb94

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10345,10 +10345,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
1034510345
break;
1034610346
}
1034710347
te = (struct nft_trans_elem *)trans->data;
10348-
if (!te->set->ops->abort ||
10349-
nft_setelem_is_catchall(te->set, &te->elem))
10350-
nft_setelem_remove(net, te->set, &te->elem);
10351-
10348+
nft_setelem_remove(net, te->set, &te->elem);
1035210349
if (!nft_setelem_is_catchall(te->set, &te->elem))
1035310350
atomic_dec(&te->set->nelems);
1035410351

0 commit comments

Comments
 (0)