Skip to content

Commit b1db244

Browse files
committed
netfilter: nf_tables: check if catch-all set element is active in next generation
When deactivating the catch-all set element, check the state in the next generation that represents this transaction. This bug uncovered after the recent removal of the element busy mark a2dd023 ("netfilter: nf_tables: remove busy mark and gc batch API"). Fixes: aaa3104 ("netfilter: nftables: add catch-all set element support") Cc: [email protected] Reported-by: lonial con <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent 9874808 commit b1db244

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6578,7 +6578,7 @@ static int nft_setelem_catchall_deactivate(const struct net *net,
65786578

65796579
list_for_each_entry(catchall, &set->catchall_list, list) {
65806580
ext = nft_set_elem_ext(set, catchall->elem);
6581-
if (!nft_is_active(net, ext))
6581+
if (!nft_is_active_next(net, ext))
65826582
continue;
65836583

65846584
kfree(elem->priv);

0 commit comments

Comments
 (0)