[PATCH] mac80211: only honor IW_SCAN_THIS_ESSID in STA, IBSS, and AP modes

[John W. Linville]

The previous IW_SCAN_THIS_ESSID patch left a hole allowing scan
requests on interfaces in inappropriate modes.

Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 net/mac80211/ieee80211_ioctl.c |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 83e4035..e1fafb6 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -521,29 +521,30 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev,
        if (!netif_running(dev))
                return -ENETDOWN;
 
+       switch (sdata->type) {
+       case IEEE80211_IF_TYPE_STA:
+       case IEEE80211_IF_TYPE_IBSS:
+               if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
+                       ssid = sdata->u.sta.ssid;
+                       ssid_len = sdata->u.sta.ssid_len;
+               }
+               break;
+       case IEEE80211_IF_TYPE_AP:
+               if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
+                       ssid = sdata->u.ap.ssid;
+                       ssid_len = sdata->u.ap.ssid_len;
+               }
+               break;
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       /* if SSID was specified explicitly then use that */
        if (wrqu->data.length == sizeof(struct iw_scan_req) &&
            wrqu->data.flags & IW_SCAN_THIS_ESSID) {
                req = (struct iw_scan_req *)extra;
                ssid = req->essid;
                ssid_len = req->essid_len;
-       } else {
-               switch (sdata->type) {
-               case IEEE80211_IF_TYPE_STA:
-               case IEEE80211_IF_TYPE_IBSS:
-                       if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
-                               ssid = sdata->u.sta.ssid;
-                               ssid_len = sdata->u.sta.ssid_len;
-                       }
-                       break;
-               case IEEE80211_IF_TYPE_AP:
-                       if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
-                               ssid = sdata->u.ap.ssid;
-                               ssid_len = sdata->u.ap.ssid_len;
-                       }
-                       break;
-               default:
-                       return -EOPNOTSUPP;
-               }
        }
 
        return ieee80211_sta_req_scan(dev, ssid, ssid_len);
-- 
1.5.2.4

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html