Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 53c520c2ab79e9f3765d24116ab54f6d5b3cd563

Authored by Florian Westphal
Committed by Pablo Neira Ayuso
1 parent 7c7bdf3599

netfilter: cttimeout: fix deadlock due to erroneous unlock/lock conversion 

The spin_unlock call should have been left as-is, revert.

Fixes: b16c29191dc89bd ("netfilter: nf_conntrack: use safer way to lock all buckets")
Reported-by: kernel test robot <fengguang.wu@intel.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

net/netfilter/nfnetlink_cttimeout.c
Diff comments   View file @ 53c520c
... ... @@ -312,7 +312,7 @@
312 312 hlist_nulls_for_each_entry(h, nn, &net->ct.hash[i], hnnode)
313 313 untimeout(h, timeout);
314 314 }
315   - nf_conntrack_lock(&nf_conntrack_locks[i % CONNTRACK_LOCKS]);
  315 + spin_unlock(&nf_conntrack_locks[i % CONNTRACK_LOCKS]);
316 316 }
317 317 local_bh_enable();
318 318 }