cfg80211: keep track of BSSes

In order to avoid problems with BSS structs going away
while they're in use, I've long wanted to make cfg80211
keep track of them. Without the SME, that wasn't doable
but now that we have the SME we can do this too. It can
keep track of up to four separate authentications and
one association, regardless of whether it's controlled
by the cfg80211 SME or the userspace SME.

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

1 files changed, 93 insertions, 63 deletions

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index d4e0b4065cbc..412161f7b08e 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -103,44 +103,37 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
 static int cfg80211_conn_do_work(struct wireless_dev *wdev)
 {
         struct cfg80211_registered_device *drv = wiphy_to_dev(wdev->wiphy);
-        union {
-                struct cfg80211_auth_request auth_req;
-                struct cfg80211_assoc_request assoc_req;
-        } u;
-
-        memset(&u, 0, sizeof(u));
+        struct cfg80211_connect_params *params;
+        int err;
 
         if (!wdev->conn)
                 return 0;
 
+        params = &wdev->conn->params;
+
         switch (wdev->conn->state) {
         case CFG80211_CONN_SCAN_AGAIN:
                 return cfg80211_conn_scan(wdev);
         case CFG80211_CONN_AUTHENTICATE_NEXT:
-                u.auth_req.chan = wdev->conn->params.channel;
-                u.auth_req.peer_addr = wdev->conn->params.bssid;
-                u.auth_req.ssid = wdev->conn->params.ssid;
-                u.auth_req.ssid_len = wdev->conn->params.ssid_len;
-                u.auth_req.auth_type = wdev->conn->params.auth_type;
-                u.auth_req.ie = NULL;
-                u.auth_req.ie_len = 0;
-                wdev->conn->state = CFG80211_CONN_AUTHENTICATING;
                 BUG_ON(!drv->ops->auth);
-                return drv->ops->auth(wdev->wiphy, wdev->netdev, &u.auth_req);
+                wdev->conn->state = CFG80211_CONN_AUTHENTICATING;
+                return cfg80211_mlme_auth(drv, wdev->netdev,
+                                          params->channel, params->auth_type,
+                                          params->bssid,
+                                          params->ssid, params->ssid_len,
+                                          NULL, 0);
         case CFG80211_CONN_ASSOCIATE_NEXT:
-                u.assoc_req.chan = wdev->conn->params.channel;
-                u.assoc_req.peer_addr = wdev->conn->params.bssid;
-                u.assoc_req.ssid = wdev->conn->params.ssid;
-                u.assoc_req.ssid_len = wdev->conn->params.ssid_len;
-                u.assoc_req.ie = wdev->conn->params.ie;
-                u.assoc_req.ie_len = wdev->conn->params.ie_len;
-                u.assoc_req.use_mfp = false;
-                memcpy(&u.assoc_req.crypto, &wdev->conn->params.crypto,
-                        sizeof(u.assoc_req.crypto));
-                wdev->conn->state = CFG80211_CONN_ASSOCIATING;
                 BUG_ON(!drv->ops->assoc);
-                return drv->ops->assoc(wdev->wiphy, wdev->netdev,
-                                        &u.assoc_req);
+                wdev->conn->state = CFG80211_CONN_ASSOCIATING;
+                err = cfg80211_mlme_assoc(drv, wdev->netdev,
+                                          params->channel, params->bssid,
+                                          params->ssid, params->ssid_len,
+                                          params->ie, params->ie_len,
+                                          false, &params->crypto);
+                if (err)
+                        cfg80211_mlme_deauth(drv, wdev->netdev, params->bssid,
+                                             NULL, 0, WLAN_REASON_DEAUTH_LEAVING);
+                return err;
         default:
                 return 0;
         }
@@ -186,7 +179,6 @@ static bool cfg80211_get_conn_bss(struct wireless_dev *wdev)
                                wdev->conn->params.ssid_len,
                                WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_PRIVACY,
                                capa);
-
         if (!bss)
                 return false;
 
@@ -264,9 +256,11 @@ void cfg80211_sme_rx_auth(struct net_device *dev, const u8 *buf, size_t len)
                 }
                 wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
                 schedule_work(&rdev->conn_work);
-        } else if (status_code != WLAN_STATUS_SUCCESS)
+        } else if (status_code != WLAN_STATUS_SUCCESS) {
                 wdev->sme_state = CFG80211_SME_IDLE;
-        else if (wdev->sme_state == CFG80211_SME_CONNECTING &&
+                kfree(wdev->conn);
+                wdev->conn = NULL;
+        } else if (wdev->sme_state == CFG80211_SME_CONNECTING &&
                  wdev->conn->state == CFG80211_CONN_AUTHENTICATING) {
                 wdev->conn->state = CFG80211_CONN_ASSOCIATE_NEXT;
                 schedule_work(&rdev->conn_work);
@@ -330,10 +324,13 @@ static void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
 
         if (wdev->current_bss) {
                 cfg80211_unhold_bss(wdev->current_bss);
-                cfg80211_put_bss(wdev->current_bss);
+                cfg80211_put_bss(&wdev->current_bss->pub);
                 wdev->current_bss = NULL;
         }
 
+        if (wdev->conn)
+                wdev->conn->state = CFG80211_CONN_IDLE;
+
         if (status == WLAN_STATUS_SUCCESS) {
                 bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
                                        wdev->ssid, wdev->ssid_len,
@@ -343,16 +340,15 @@ static void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
                 if (WARN_ON(!bss))
                         return;
 
-                cfg80211_hold_bss(bss);
-                wdev->current_bss = bss;
+                cfg80211_hold_bss(bss_from_pub(bss));
+                wdev->current_bss = bss_from_pub(bss);
 
                 wdev->sme_state = CFG80211_SME_CONNECTED;
         } else {
                 wdev->sme_state = CFG80211_SME_IDLE;
+                kfree(wdev->conn);
+                wdev->conn = NULL;
         }
-
-        if (wdev->conn)
-                wdev->conn->state = CFG80211_CONN_IDLE;
 }
 
 void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
@@ -387,7 +383,7 @@ void cfg80211_roamed(struct net_device *dev, const u8 *bssid,
         }
 
         cfg80211_unhold_bss(wdev->current_bss);
-        cfg80211_put_bss(wdev->current_bss);
+        cfg80211_put_bss(&wdev->current_bss->pub);
         wdev->current_bss = NULL;
 
         bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
@@ -397,8 +393,8 @@ void cfg80211_roamed(struct net_device *dev, const u8 *bssid,
         if (WARN_ON(!bss))
                 return;
 
-        cfg80211_hold_bss(bss);
-        wdev->current_bss = bss;
+        cfg80211_hold_bss(bss_from_pub(bss));
+        wdev->current_bss = bss_from_pub(bss);
 
         nl80211_send_roamed(wiphy_to_dev(wdev->wiphy), dev, bssid,
                             req_ie, req_ie_len, resp_ie, resp_ie_len, gfp);
@@ -440,7 +436,7 @@ void __cfg80211_disconnected(struct net_device *dev, gfp_t gfp, u8 *ie,
 
         if (wdev->current_bss) {
                 cfg80211_unhold_bss(wdev->current_bss);
-                cfg80211_put_bss(wdev->current_bss);
+                cfg80211_put_bss(&wdev->current_bss->pub);
         }
 
         wdev->current_bss = NULL;
@@ -449,6 +445,8 @@ void __cfg80211_disconnected(struct net_device *dev, gfp_t gfp, u8 *ie,
         if (wdev->conn) {
                 kfree(wdev->conn->ie);
                 wdev->conn->ie = NULL;
+                kfree(wdev->conn);
+                wdev->conn = NULL;
         }
 
         nl80211_send_disconnected(wiphy_to_dev(wdev->wiphy), dev,
@@ -482,12 +480,12 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
                 if (!rdev->ops->auth || !rdev->ops->assoc)
                         return -EOPNOTSUPP;
 
-                if (!wdev->conn) {
-                        wdev->conn = kzalloc(sizeof(*wdev->conn), GFP_KERNEL);
-                        if (!wdev->conn)
-                                return -ENOMEM;
-                } else
-                        memset(wdev->conn, 0, sizeof(*wdev->conn));
+                if (WARN_ON(wdev->conn))
+                        return -EINPROGRESS;
+
+                wdev->conn = kzalloc(sizeof(*wdev->conn), GFP_KERNEL);
+                if (!wdev->conn)
+                        return -ENOMEM;
 
                 /*
                  * Copy all parameters, and treat explicitly IEs, BSSID, SSID.
@@ -502,8 +500,11 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
                         wdev->conn->ie = kmemdup(connect->ie, connect->ie_len,
                                                 GFP_KERNEL);
                         wdev->conn->params.ie = wdev->conn->ie;
-                        if (!wdev->conn->ie)
+                        if (!wdev->conn->ie) {
+                                kfree(wdev->conn);
+                                wdev->conn = NULL;
                                 return -ENOMEM;
+                        }
                 }
 
                 if (connect->auth_type == NL80211_AUTHTYPE_AUTOMATIC) {
@@ -543,8 +544,11 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
                                 wdev->conn->state = CFG80211_CONN_SCAN_AGAIN;
                         }
                 }
-                if (err)
+                if (err) {
+                        kfree(wdev->conn);
+                        wdev->conn = NULL;
                         wdev->sme_state = CFG80211_SME_IDLE;
+                }
 
                 return err;
         } else {
@@ -572,31 +576,27 @@ int cfg80211_disconnect(struct cfg80211_registered_device *rdev,
                 return -EINVAL;
 
         if (!rdev->ops->disconnect) {
-                struct cfg80211_deauth_request deauth;
-                u8 bssid[ETH_ALEN];
+                if (!rdev->ops->deauth)
+                        return -EOPNOTSUPP;
 
-                /* internal bug. */
-                if (WARN_ON(!wdev->conn))
-                        return -EINVAL;
+                /* was it connected by userspace SME? */
+                if (!wdev->conn) {
+                        cfg80211_mlme_down(rdev, dev);
+                        return 0;
+                }
 
                 if (wdev->sme_state == CFG80211_SME_CONNECTING &&
                     (wdev->conn->state == CFG80211_CONN_SCANNING ||
                      wdev->conn->state == CFG80211_CONN_SCAN_AGAIN)) {
                         wdev->sme_state = CFG80211_SME_IDLE;
+                        kfree(wdev->conn);
+                        wdev->conn = NULL;
                         return 0;
                 }
 
-                if (!rdev->ops->deauth)
-                        return -EOPNOTSUPP;
-
-                memset(&deauth, 0, sizeof(deauth));
-
                 /* wdev->conn->params.bssid must be set if > SCANNING */
-                memcpy(bssid, wdev->conn->params.bssid, ETH_ALEN);
-                deauth.peer_addr = bssid;
-                deauth.reason_code = reason;
-
-                err = rdev->ops->deauth(&rdev->wiphy, dev, &deauth);
+                err = cfg80211_mlme_deauth(rdev, dev, wdev->conn->params.bssid,
+                                           NULL, 0, reason);
                 if (err)
                         return err;
         } else {
@@ -614,3 +614,33 @@ int cfg80211_disconnect(struct cfg80211_registered_device *rdev,
 
         return 0;
 }
+
+void cfg80211_sme_disassoc(struct net_device *dev, int idx)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+        u8 bssid[ETH_ALEN];
+
+        if (!wdev->conn)
+                return;
+
+        if (wdev->conn->state == CFG80211_CONN_IDLE)
+                return;
+
+        /*
+         * Ok, so the association was made by this SME -- we don't
+         * want it any more so deauthenticate too.
+         */
+
+        if (!wdev->auth_bsses[idx])
+                return;
+
+        memcpy(bssid, wdev->auth_bsses[idx]->pub.bssid, ETH_ALEN);
+        if (cfg80211_mlme_deauth(rdev, dev, bssid,
+                                 NULL, 0, WLAN_REASON_DEAUTH_LEAVING)) {
+                /* whatever -- assume gone anyway */
+                cfg80211_unhold_bss(wdev->auth_bsses[idx]);
+                cfg80211_put_bss(&wdev->auth_bsses[idx]->pub);
+                wdev->auth_bsses[idx] = NULL;
+        }
+}