Commit 79845c66 authored by Johannes Berg's avatar Johannes Berg

cfg80211: fix scheduled scan pointer access

Since rdev->sched_scan_req is dereferenced outside the
lock protecting it, this might be done at the wrong
time, causing crashes. Move the dereference to where
it should be - inside the RTNL locked section.

Cc: stable@vger.kernel.org [3.8+]
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 095d81ce
...@@ -254,10 +254,10 @@ void __cfg80211_sched_scan_results(struct work_struct *wk) ...@@ -254,10 +254,10 @@ void __cfg80211_sched_scan_results(struct work_struct *wk)
rdev = container_of(wk, struct cfg80211_registered_device, rdev = container_of(wk, struct cfg80211_registered_device,
sched_scan_results_wk); sched_scan_results_wk);
request = rdev->sched_scan_req;
rtnl_lock(); rtnl_lock();
request = rdev->sched_scan_req;
/* we don't have sched_scan_req anymore if the scan is stopping */ /* we don't have sched_scan_req anymore if the scan is stopping */
if (request) { if (request) {
if (request->flags & NL80211_SCAN_FLAG_FLUSH) { if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment