From a848eac5f14ec9c11480d428afb393a7c3ef4407 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Tue, 18 Dec 2018 21:38:09 +0530 Subject: [PATCH] qcacld-3.0: Fix NULL check in csr_roam_save_connected_information Fix NULL check issue in csr_roam_save_connected_information, verify number of ssid to check if ssid is present in profile. Change-Id: Id8e760e505e2d216a97e5924ff7e2c1cf664d6b7 CRs-Fixed: 2369161 --- core/sme/src/csr/csr_api_roam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 8e10608230d1..192842c81348 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -8780,7 +8780,7 @@ QDF_STATUS csr_roam_save_connected_information(struct mac_context *mac, qdf_mem_copy(pConnectProfile->SSID.ssId, pIesTemp->SSID.ssid, pIesTemp->SSID.num_ssid); - } else if (pProfile->SSIDs.SSIDList) { + } else if (pProfile->SSIDs.numOfSSIDs) { pConnectProfile->SSID.length = pProfile->SSIDs.SSIDList[0].SSID.length; qdf_mem_copy(pConnectProfile->SSID.ssId, @@ -14832,7 +14832,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId, csr_join_req->ssId.length = pIes->SSID.num_ssid; qdf_mem_copy(&csr_join_req->ssId.ssId, pIes->SSID.ssid, pIes->SSID.num_ssid); - } else if (pProfile->SSIDs.SSIDList) { + } else if (pProfile->SSIDs.numOfSSIDs) { csr_join_req->ssId.length = pProfile->SSIDs.SSIDList[0].SSID.length; qdf_mem_copy(&csr_join_req->ssId.ssId,