cfg80211: Fix race in bss timeout

It is quite possible to run into a race in bss timeout where
the drivers see the bss entry just before notifying cfg80211
of a roaming event but it got timed out by the time rdev->event_work
got scehduled from cfg80211_wq. This would result in the following
WARN-ON() along with the failure to notify the user space of
the roaming. The other situation which is happening with ath6kl
that runs into issue is when the driver reports roam to same AP
event where the AP bss entry already got expired. To fix this,
move cfg80211_get_bss() from __cfg80211_roamed() to cfg80211_roamed().

[158645.538384] WARNING: at net/wireless/sme.c:586
__cfg80211_roamed+0xc2/0x1b1()
[158645.538810] Call Trace:
[158645.538838]  [<c1033527>] warn_slowpath_common+0x65/0x7a
[158645.538917]  [<c14cfacf>] ? __cfg80211_roamed+0xc2/0x1b1
[158645.538946]  [<c103354b>] warn_slowpath_null+0xf/0x13
[158645.539055]  [<c14cfacf>] __cfg80211_roamed+0xc2/0x1b1
[158645.539086]  [<c14beb5b>] cfg80211_process_rdev_events+0x153/0x1cc
[158645.539166]  [<c14bd57b>] cfg80211_event_work+0x26/0x36
[158645.539195]  [<c10482ae>] process_one_work+0x219/0x38b
[158645.539273]  [<c14bd555>] ? wiphy_new+0x419/0x419
[158645.539301]  [<c10486cb>] worker_thread+0xf6/0x1bf
[158645.539379]  [<c10485d5>] ? rescuer_thread+0x1b5/0x1b5
[158645.539407]  [<c104b3e2>] kthread+0x62/0x67
[158645.539484]  [<c104b380>] ? __init_kthread_worker+0x42/0x42
[158645.539514]  [<c151309a>] kernel_thread_helper+0x6/0xd

Reported-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 45 insertions, 28 deletions

diff --git a/net/wireless/core.h b/net/wireless/core.h
index fb08c28fc90a..43ad9c81efcf 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -249,12 +249,11 @@ struct cfg80211_event {
                         u16 status;
                 } cr;
                 struct {
-                        struct ieee80211_channel *channel;
-                        u8 bssid[ETH_ALEN];
                         const u8 *req_ie;
                         const u8 *resp_ie;
                         size_t req_ie_len;
                         size_t resp_ie_len;
+                        struct cfg80211_bss *bss;
                 } rm;
                 struct {
                         const u8 *ie;
@@ -403,8 +402,7 @@ int cfg80211_disconnect(struct cfg80211_registered_device *rdev,
                         struct net_device *dev, u16 reason,
                         bool wextev);
 void __cfg80211_roamed(struct wireless_dev *wdev,
-                       struct ieee80211_channel *channel,
-                       const u8 *bssid,
+                       struct cfg80211_bss *bss,
                        const u8 *req_ie, size_t req_ie_len,
                        const u8 *resp_ie, size_t resp_ie_len);
 int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index f0c900ce2fb9..7b9ecaed96be 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -553,45 +553,35 @@ void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
 EXPORT_SYMBOL(cfg80211_connect_result);
 
 void __cfg80211_roamed(struct wireless_dev *wdev,
-                       struct ieee80211_channel *channel,
-                       const u8 *bssid,
+                       struct cfg80211_bss *bss,
                        const u8 *req_ie, size_t req_ie_len,
                        const u8 *resp_ie, size_t resp_ie_len)
 {
-        struct cfg80211_bss *bss;
 #ifdef CONFIG_CFG80211_WEXT
         union iwreq_data wrqu;
 #endif
-
         ASSERT_WDEV_LOCK(wdev);
 
         if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION &&
                     wdev->iftype != NL80211_IFTYPE_P2P_CLIENT))
-                return;
+                goto out;
 
         if (wdev->sme_state != CFG80211_SME_CONNECTED)
-                return;
+                goto out;
 
         /* internal error -- how did we get to CONNECTED w/o BSS? */
         if (WARN_ON(!wdev->current_bss)) {
-                return;
+                goto out;
         }
 
         cfg80211_unhold_bss(wdev->current_bss);
         cfg80211_put_bss(&wdev->current_bss->pub);
         wdev->current_bss = NULL;
 
-        bss = cfg80211_get_bss(wdev->wiphy, channel, bssid,
-                               wdev->ssid, wdev->ssid_len,
-                               WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
-
-        if (WARN_ON(!bss))
-                return;
-
         cfg80211_hold_bss(bss_from_pub(bss));
         wdev->current_bss = bss_from_pub(bss);
 
-        nl80211_send_roamed(wiphy_to_dev(wdev->wiphy), wdev->netdev, bssid,
+        nl80211_send_roamed(wiphy_to_dev(wdev->wiphy), wdev->netdev, bss->bssid,
                             req_ie, req_ie_len, resp_ie, resp_ie_len,
                             GFP_KERNEL);
 
@@ -612,11 +602,15 @@ void __cfg80211_roamed(struct wireless_dev *wdev,
 
         memset(&wrqu, 0, sizeof(wrqu));
         wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-        memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
-        memcpy(wdev->wext.prev_bssid, bssid, ETH_ALEN);
+        memcpy(wrqu.ap_addr.sa_data, bss->bssid, ETH_ALEN);
+        memcpy(wdev->wext.prev_bssid, bss->bssid, ETH_ALEN);
         wdev->wext.prev_bssid_valid = true;
         wireless_send_event(wdev->netdev, SIOCGIWAP, &wrqu, NULL);
 #endif
+
+        return;
+out:
+        cfg80211_put_bss(bss);
 }
 
 void cfg80211_roamed(struct net_device *dev,
@@ -626,32 +620,57 @@ void cfg80211_roamed(struct net_device *dev,
                      const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct cfg80211_bss *bss;
+
+        CFG80211_DEV_WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED);
+
+        bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, wdev->ssid,
+                               wdev->ssid_len, WLAN_CAPABILITY_ESS,
+                               WLAN_CAPABILITY_ESS);
+        if (WARN_ON(!bss))
+                return;
+
+        cfg80211_roamed_bss(dev, bss, req_ie, req_ie_len, resp_ie,
+                            resp_ie_len, gfp);
+}
+EXPORT_SYMBOL(cfg80211_roamed);
+
+void cfg80211_roamed_bss(struct net_device *dev,
+                         struct cfg80211_bss *bss, const u8 *req_ie,
+                         size_t req_ie_len, const u8 *resp_ie,
+                         size_t resp_ie_len, gfp_t gfp)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
         struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
         struct cfg80211_event *ev;
         unsigned long flags;
 
         CFG80211_DEV_WARN_ON(wdev->sme_state != CFG80211_SME_CONNECTED);
 
+        if (WARN_ON(!bss))
+                return;
+
         ev = kzalloc(sizeof(*ev) + req_ie_len + resp_ie_len, gfp);
-        if (!ev)
+        if (!ev) {
+                cfg80211_put_bss(bss);
                 return;
+        }
 
         ev->type = EVENT_ROAMED;
-        ev->rm.channel = channel;
-        memcpy(ev->rm.bssid, bssid, ETH_ALEN);
         ev->rm.req_ie = ((u8 *)ev) + sizeof(*ev);
         ev->rm.req_ie_len = req_ie_len;
         memcpy((void *)ev->rm.req_ie, req_ie, req_ie_len);
         ev->rm.resp_ie = ((u8 *)ev) + sizeof(*ev) + req_ie_len;
         ev->rm.resp_ie_len = resp_ie_len;
         memcpy((void *)ev->rm.resp_ie, resp_ie, resp_ie_len);
+        ev->rm.bss = bss;
 
         spin_lock_irqsave(&wdev->event_lock, flags);
         list_add_tail(&ev->list, &wdev->event_list);
         spin_unlock_irqrestore(&wdev->event_lock, flags);
         queue_work(cfg80211_wq, &rdev->event_work);
 }
-EXPORT_SYMBOL(cfg80211_roamed);
+EXPORT_SYMBOL(cfg80211_roamed_bss);
 
 void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
                              size_t ie_len, u16 reason, bool from_ap)
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 9c601d59b77a..e77df7585004 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -740,9 +740,9 @@ static void cfg80211_process_wdev_events(struct wireless_dev *wdev)
                                 NULL);
                         break;
                 case EVENT_ROAMED:
-                        __cfg80211_roamed(wdev, ev->rm.channel, ev->rm.bssid,
-                                          ev->rm.req_ie, ev->rm.req_ie_len,
-                                          ev->rm.resp_ie, ev->rm.resp_ie_len);
+                        __cfg80211_roamed(wdev, ev->rm.bss, ev->rm.req_ie,
+                                          ev->rm.req_ie_len, ev->rm.resp_ie,
+                                          ev->rm.resp_ie_len);
                         break;
                 case EVENT_DISCONNECTED:
                         __cfg80211_disconnected(wdev->netdev,