mac80211: fix scan vs. interface removal race

When we remove an interface, we can currently end up having
a pointer to it left in local->scan_sdata after it has been
set down, and then with a hardware scan the scan completion
can try to access it which is a bug. Alternatively, a scan
that started as a hardware scan may terminate as though it
was a software scan, if the timing is just right.

On SMP systems, software scan also has a similar problem,
just canceling the delayed work and setting a flag isn't
enough since it may be running concurrently; in this case
we would also never restore state of other interfaces.

This patch hopefully fixes the problems by always invoking
ieee80211_scan_completed or requiring it to be invoked by
the driver, I suspect the drivers that have ->hw_scan() are
buggy. The bug will not manifest itself unless you remove
the interface while hw-scanning which will also turn off
the hw, and then add a new interface which will be unusable
until you scan once.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index f504e3eca7d3eaf4e173b7d4e60b5a05e3e20472..d67882dd3604cc4435dc6e2cca3afe7de04d73bb 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1124,7 +1124,9 @@ enum ieee80211_ampdu_mlme_action {
  * @hw_scan: Ask the hardware to service the scan request, no need to start
  *     the scan state machine in stack. The scan must honour the channel
  *     configuration done by the regulatory agent in the wiphy's registered
- *     bands.
+ *     bands. When the scan finishes, ieee80211_scan_completed() must be
+ *     called; note that it also must be called when the scan cannot finish
+ *     because the hardware is turned off! Anything else is a bug!
  *
  * @get_stats: return low-level statistics
  *

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index ebdec7106d6365af4b25c16f3d7c591322e4fd73..4bfac4b41c51e4de008d33fd7b3bbed8270b1ae0 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -564,14 +564,6 @@ static int ieee80211_stop(struct net_device *dev)
                synchronize_rcu();
                skb_queue_purge(&sdata->u.sta.skb_queue);
 
-               if (local->scan_sdata == sdata) {
-                       if (!local->ops->hw_scan) {
-                               local->sta_sw_scanning = 0;
-                               cancel_delayed_work(&local->scan_work);
-                       } else
-                               local->sta_hw_scanning = 0;
-               }
-
                sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED;
                kfree(sdata->u.sta.extra_ie);
                sdata->u.sta.extra_ie = NULL;
@@ -585,6 +577,31 @@ static int ieee80211_stop(struct net_device *dev)
                }
                /* fall through */
        default:
+               if (local->scan_sdata == sdata) {
+                       if (!local->ops->hw_scan)
+                               cancel_delayed_work_sync(&local->scan_work);
+                       /*
+                        * The software scan can no longer run now, so we can
+                        * clear out the scan_sdata reference. However, the
+                        * hardware scan may still be running. The complete
+                        * function must be prepared to handle a NULL value.
+                        */
+                       local->scan_sdata = NULL;
+                       /*
+                        * The memory barrier guarantees that another CPU
+                        * that is hardware-scanning will now see the fact
+                        * that this interface is gone.
+                        */
+                       smp_mb();
+                       /*
+                        * If software scanning, complete the scan but since
+                        * the scan_sdata is NULL already don't send out a
+                        * scan event to userspace -- the scan is incomplete.
+                        */
+                       if (local->sta_sw_scanning)
+                               ieee80211_scan_completed(&local->hw);
+               }
+
                conf.vif = &sdata->vif;
                conf.type = sdata->vif.type;
                conf.mac_addr = dev->dev_addr;

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9e20a0c20a46c9c53fd5348efe7941f64ba045dc..19c7f21e49d176ccdf6de150acac689f751cf035 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2530,7 +2530,7 @@ void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local)
        struct ieee80211_sub_if_data *sdata = local->scan_sdata;
        struct ieee80211_if_sta *ifsta;
 
-       if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {
+       if (sdata && sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {
                ifsta = &sdata->u.sta;
                if (!(ifsta->flags & IEEE80211_STA_BSSID_SET) ||
                    (!(ifsta->state == IEEE80211_STA_MLME_IBSS_JOINED) &&

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index f4399e9ac928f76cb47839cadb0bbb63c3969516..27727027d76d31246e2fa7dacc6e415ce6dc0135 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -430,9 +430,20 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
        struct ieee80211_sub_if_data *sdata;
        union iwreq_data wrqu;
 
+       if (WARN_ON(!local->sta_hw_scanning && !local->sta_sw_scanning))
+               return;
+
        local->last_scan_completed = jiffies;
        memset(&wrqu, 0, sizeof(wrqu));
-       wireless_send_event(local->scan_sdata->dev, SIOCGIWSCAN, &wrqu, NULL);
+
+       /*
+        * local->scan_sdata could have been NULLed by the interface
+        * down code in case we were scanning on an interface that is
+        * being taken down.
+        */
+       sdata = local->scan_sdata;
+       if (sdata)
+               wireless_send_event(sdata->dev, SIOCGIWSCAN, &wrqu, NULL);
 
        if (local->sta_hw_scanning) {
                local->sta_hw_scanning = 0;
@@ -491,7 +502,10 @@ void ieee80211_sta_scan_work(struct work_struct *work)
        int skip;
        unsigned long next_delay = 0;
 
-       if (!local->sta_sw_scanning)
+       /*
+        * Avoid re-scheduling when the sdata is going away.
+        */
+       if (!netif_running(sdata->dev))
                return;
 
        switch (local->scan_state) {
@@ -570,9 +584,8 @@ void ieee80211_sta_scan_work(struct work_struct *work)
                break;
        }
 
-       if (local->sta_sw_scanning)
-               queue_delayed_work(local->hw.workqueue, &local->scan_work,
-                                  next_delay);
+       queue_delayed_work(local->hw.workqueue, &local->scan_work,
+                          next_delay);
 }
 
 
@@ -609,13 +622,16 @@ int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata,
        }
 
        if (local->ops->hw_scan) {
-               int rc = local->ops->hw_scan(local_to_hw(local),
-                                            ssid, ssid_len);
-               if (!rc) {
-                       local->sta_hw_scanning = 1;
-                       local->scan_sdata = scan_sdata;
+               int rc;
+
+               local->sta_hw_scanning = 1;
+               rc = local->ops->hw_scan(local_to_hw(local), ssid, ssid_len);
+               if (rc) {
+                       local->sta_hw_scanning = 0;
+                       return rc;
                }
-               return rc;
+               local->scan_sdata = scan_sdata;
+               return 0;
        }
 
        local->sta_sw_scanning = 1;