summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-10-21 11:33:35 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-10-21 11:59:15 +0200
commit79845c662eeb95c9a180b9bd0d3ad848ee65b94c (patch)
tree191a0f1abdc8af9391159bd09c11fa981204aa12
parent095d81cee742fc31e1218077ca6ca8f0df07c613 (diff)
downloadop-kernel-dev-79845c662eeb95c9a180b9bd0d3ad848ee65b94c.zip
op-kernel-dev-79845c662eeb95c9a180b9bd0d3ad848ee65b94c.tar.gz
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: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/wireless/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index eeb7148..d4397eb 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -254,10 +254,10 @@ void __cfg80211_sched_scan_results(struct work_struct *wk)
rdev = container_of(wk, struct cfg80211_registered_device,
sched_scan_results_wk);
- request = rdev->sched_scan_req;
-
rtnl_lock();
+ request = rdev->sched_scan_req;
+
/* we don't have sched_scan_req anymore if the scan is stopping */
if (request) {
if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
OpenPOWER on IntegriCloud