commit a54f667c1e1be76240efa6bf2cdcb657ffcbd528
author Hangtian Zhu <hangtian@qti.qualcomm.com> Thu Jun 07 13:12:43 2018 +0800
committer Tom Hochstein <tom.hochstein@nxp.com> Thu Dec 13 14:45:46 2018 -0600
tree 53b4f5e961d5ffeece7fa65f8efd33716353666d
parent 0f833df5923152153ae6feca9fb8fb9a6feae9ef

MLK-18490 CORE: HDD: add ssid len check

Add ssid len check to avoid the race between iface up and down.

log:
[ 1579.835577] CPU: 1 PID: 8058 Comm: kworker/u8:0 Tainted:
[ 1579.846096] Hardware name: FSL i.MX8MM EVK board (DT)
[ 1579.851154] Workqueue: cfg80211 cfg80211_event_work
[ 1579.856649] task: ffff800077df0c80 task.stack: ffff80006e668000
[ 1579.862739] PC is at __cfg80211_connect_result+0x2d0/0x400
[ 1579.868224] LR is at __cfg80211_connect_result+0x13c/0x400
[ 1579.873709] pc : [<ffff000008c1f428>] lr : [<ffff000008c1f294>] pstate: 40000145

Signed-off-by: Hangtian Zhu <hangtian@qti.qualcomm.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>

CORE/HDD/src/wlan_hdd_assoc.c

diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 889ea95..9818d79 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -2309,6 +2309,7 @@
     hdd_ap_ctx_t *hdd_ap_ctx;
     uint8_t default_sap_channel = 6;
     tSirResultCodes timeout_reason = 0;
+    struct wireless_dev *wdev = dev->ieee80211_ptr;
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
     if (pRoamInfo && pRoamInfo->roamSynchInProgress) {
        /* change logging before release */
@@ -2604,12 +2605,13 @@
                     hddLog(LOG1, "%s ft_carrier_on is %d, sending connect "
                                  "indication", __FUNCTION__, ft_carrier_on);
 
-                    hdd_connect_result(dev, pRoamInfo->bssid, pRoamInfo,
-                                       pFTAssocReq, assocReqlen,
-                                       pFTAssocRsp, assocRsplen,
-                                       WLAN_STATUS_SUCCESS,
-                                       GFP_KERNEL, false,
-                                       pRoamInfo->statusCode);
+		    if(wdev->ssid_len != 0)
+			    hdd_connect_result(dev, pRoamInfo->bssid, pRoamInfo,
+					       pFTAssocReq, assocReqlen,
+					       pFTAssocRsp, assocRsplen,
+					       WLAN_STATUS_SUCCESS,
+					       GFP_KERNEL, false,
+					       pRoamInfo->statusCode);
                 }
             }
             else
@@ -2640,11 +2642,12 @@
                                roamResult, roamStatus);
 
                         /* inform connect result to nl80211 */
-                        hdd_connect_result(dev, pRoamInfo->bssid, pRoamInfo,
-                                reqRsnIe, reqRsnLength,
-                                rspRsnIe, rspRsnLength,
-                                WLAN_STATUS_SUCCESS,
-                                GFP_KERNEL, false, pRoamInfo->statusCode);
+			if(wdev->ssid_len != 0)
+				hdd_connect_result(dev, pRoamInfo->bssid, pRoamInfo,
+					reqRsnIe, reqRsnLength,
+					rspRsnIe, rspRsnLength,
+					WLAN_STATUS_SUCCESS,
+					GFP_KERNEL, false, pRoamInfo->statusCode);
                     }
                 }
             }