Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38ed6a5f authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: use correct lock to protect gc_list 



commit 8357bc946a2abc2a10ca40e5a2105d2b4c57515e upstream.

Use nf_tables_gc_list_lock spinlock, not nf_tables_destroy_list_lock to
protect the gc_list.

Fixes: 5f68718b34a5 ("netfilter: nf_tables: GC transaction API to avoid race with control plane")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b6346dc

net/netfilter/nf_tables_api.c

+2 −2
Original line number Diff line number Diff line
@@ -7028,9 +7028,9 @@ static void nft_trans_gc_work(struct work_struct *work) 
	struct nft_trans_gc *trans, *next;

	LIST_HEAD(trans_gc_list);



	spin_lock(&nf_tables_destroy_list_lock);

	spin_lock(&nf_tables_gc_list_lock);

	list_splice_init(&nf_tables_gc_list, &trans_gc_list);

	spin_unlock(&nf_tables_destroy_list_lock);

	spin_unlock(&nf_tables_gc_list_lock);



	list_for_each_entry_safe(trans, next, &trans_gc_list, list) {

		list_del(&trans->list);