mac80211: fix scan abort sanity checks
Johannes Berg
maintainerPATCH 1/1 mac80211: fix scan abort sanity checks
Since sometimes mac80211 queues up a scan request to only act on it later, it must be allowed to (internally) cancel a not-yet-running scan, e.g. when the interface is taken down. This condition was missing since we always checked only the local->scanning variable which isn't yet set in that situation.
Reported-by Luis R. Rodriguez <[email protected]>
Signed-off-by Johannes Berg <[email protected]>
--- net/mac80211/scan.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/mac80211/scan.c +8 -4
@@ -288,10 +288,14 @@ void ieee80211_scan_completed(struct ieemutex_lock (&local->scan_mtx); -if (WARN_ON (!local->scanning)) { -mutex_unlock (&local->scan_mtx); -return ; - } +/* +* It's ok to abort a not-yet-running scan (that +* we have one at all will be verified by checking +* local->scan_req next), but not to complete it +* successfully. +*/ +if (WARN_ON (!local->scanning && !aborted)) + aborted = true;if (WARN_ON (!local->scan_req)) {mutex_unlock (&local->scan_mtx);