Skip to content

Commit 08e4c8c

Browse files
Florian Westphalummakynes
authored andcommitted
netfilter: nf_tables: mark newset as dead on transaction abort
If a transaction is aborted, we should mark the to-be-released NEWSET dead, just like commit path does for DEL and DESTROYSET commands. In both cases all remaining elements will be released via set->ops->destroy(). The existing abort code does NOT post the actual release to the work queue. Also the entire __nf_tables_abort() function is wrapped in gc_seq begin/end pair. Therefore, async gc worker will never try to release the pending set elements, as gc sequence is always stale. It might be possible to speed up transaction aborts via work queue too, this would result in a race and a possible use-after-free. So fix this before it becomes an issue. Fixes: 5f68718 ("netfilter: nf_tables: GC transaction API to avoid race with control plane") Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent 3fde94b commit 08e4c8c

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10464,6 +10464,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
1046410464
nft_trans_destroy(trans);
1046510465
break;
1046610466
}
10467+
nft_trans_set(trans)->dead = 1;
1046710468
list_del_rcu(&nft_trans_set(trans)->list);
1046810469
break;
1046910470
case NFT_MSG_DELSET:

0 commit comments

Comments
 (0)