]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
cfg80211: fix management registrations deadlock
authorJohannes Berg <johannes.berg@intel.com>
Thu, 4 Jun 2020 10:04:20 +0000 (12:04 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 5 Jun 2020 07:22:00 +0000 (09:22 +0200)
commit79ea1e12c0b8540100e89b32afb9f0e6503fad35
treea5ce18c194bb617ec5337fedfe2395ba02ca5a9b
parent98749b7188affbf2900c2aab704a8853901d1139
cfg80211: fix management registrations deadlock

Lockdep reports that we may deadlock because we take the RTNL on
the work struct, but flush it under RTNL. Clearly, it's correct.
In practice, this can happen when doing rfkill on an active device.

Fix this by moving the work struct to the wiphy (registered dev)
layer, and iterate over all the wdevs inside there. This then
means we need to track which one of them has work to do, so we
don't update to the driver for all wdevs all the time.

Also fix a locking bug I noticed while working on this - the
registrations list is iterated as if it was an RCU list, but it
isn't handle that way - and we need to lock now for the update
flag anyway, so remove the RCU.

Fixes: 6cd536fe62ef ("cfg80211: change internal management frame registration API")
Reported-by: Markus Theil <markus.theil@tu-ilmenau.de>
Reported-and-tested-by: Kenneth R. Crudup <kenny@panix.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20200604120420.b1dc540a7e26.I55dcca56bb5bdc5d7ad66a36a0b42afd7034d8be@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
include/net/cfg80211.h
net/wireless/core.c
net/wireless/core.h
net/wireless/mlme.c