From: Pablo Neira Ayuso Date: Tue, 19 Dec 2023 18:44:49 +0000 (+0100) Subject: netfilter: nf_tables: skip set commit for deleted/destroyed sets X-Git-Tag: v6.7~11^2~32^2 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=7315dc1e122c85ffdfc8defffbb8f8b616c2eb1a;p=sfrench%2Fcifs-2.6.git netfilter: nf_tables: skip set commit for deleted/destroyed sets NFT_MSG_DELSET deactivates all elements in the set, skip set->ops->commit() to avoid the unnecessary clone (for the pipapo case) as well as the sync GC cycle, which could deactivate again expired elements in such set. Fixes: 5f68718b34a5 ("netfilter: nf_tables: GC transaction API to avoid race with control plane") Reported-by: Kevin Rich Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index c5c17c6e80ed..be04af433988 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -9887,7 +9887,7 @@ static void nft_set_commit_update(struct list_head *set_update_list) list_for_each_entry_safe(set, next, set_update_list, pending_update) { list_del_init(&set->pending_update); - if (!set->ops->commit) + if (!set->ops->commit || set->dead) continue; set->ops->commit(set);