qcacld: Fix for static analysis error

Fix for static analysis error

Change-Id: I8ed907a5ef17609647fae415911090e78806900d
CRs-fixed: 725974

3 files changed, 28 insertions, 10 deletions

diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index 50ea36f9dccd..7e76f52cbcc1 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -178,9 +178,11 @@ void lim_check_sta_in_pe_entries(tpAniSirGlobal pMac, tpSirMacMgmtHdr pHdr)
 
     for(i = 0; i < pMac->lim.maxBssId; i++)
     {
-        if( ((psessionEntry = &pMac->lim.gpSession[i]) != NULL) &&
+        if ((&pMac->lim.gpSession[i] != NULL) &&
             (pMac->lim.gpSession[i].valid) &&
-            (pMac->lim.gpSession[i].pePersona == VOS_STA_SAP_MODE) ) {
+            (pMac->lim.gpSession[i].pePersona == VOS_STA_SAP_MODE)) {
+
+            psessionEntry = &pMac->lim.gpSession[i];
 
             pStaDs = dphLookupHashEntry(pMac, pHdr->sa, &assocId,
                             &psessionEntry->dph.dphHashTable);
diff --git a/CORE/SME/src/QoS/sme_Qos.c b/CORE/SME/src/QoS/sme_Qos.c
index 57482b98368f..65ce24d47403 100644
--- a/CORE/SME/src/QoS/sme_Qos.c
+++ b/CORE/SME/src/QoS/sme_Qos.c
@@ -3231,13 +3231,21 @@ eHalStatus sme_QosESEProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionI
     sme_QosSessionInfo *pSession;
     sme_QosACInfo *pACInfo;
     tDot11fIEWMMTSPEC *pTspecIE = NULL;
-    tCsrRoamSession *pCsrSession = CSR_GET_SESSION( pMac, sessionId );
-    tCsrRoamConnectedInfo *pCsrConnectedInfo = &pCsrSession->connectedInfo;
+    tCsrRoamSession *pCsrSession = NULL;
+    tCsrRoamConnectedInfo *pCsrConnectedInfo = NULL;
     eHalStatus status = eHAL_STATUS_FAILURE;
     v_U8_t ac, numTspec, cnt;
     v_U8_t tspec_flow_index, tspec_mask_status;
     v_U32_t tspecIeLen;
 
+    pCsrSession = CSR_GET_SESSION(pMac, sessionId);
+    if (NULL == pCsrSession) {
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+            FL("session %d not found"), sessionId);
+        return eHAL_STATUS_FAILURE;
+    }
+
+    pCsrConnectedInfo = &pCsrSession->connectedInfo;
     pSession = &sme_QosCb.sessionInfo[sessionId];
 
     // Get the TSPEC IEs which came along with the reassoc response
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 15ec5eee47b1..7ec7eee514ab 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -7669,14 +7669,17 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI
     eHalStatus status = eHAL_STATUS_SUCCESS;
     tDot11fBeaconIEs *pIesTemp = pIes;
     tANI_U8 index;
-    tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-    tCsrRoamConnectedProfile *pConnectProfile = &pSession->connectedProfile;
+    tCsrRoamSession *pSession = NULL;
+    tCsrRoamConnectedProfile *pConnectProfile = NULL;
 
-    if(!pSession)
-    {
-        smsLog(pMac, LOGE, FL("  session %d not found "), sessionId);
+    pSession = CSR_GET_SESSION(pMac, sessionId);
+    if (NULL == pSession) {
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+            FL("session %d not found"), sessionId);
         return eHAL_STATUS_FAILURE;
     }
+
+    pConnectProfile = &pSession->connectedProfile;
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
     if (pSession->roamOffloadSynchParams.bRoamSynchInProgress)
     {
@@ -7740,7 +7743,7 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI
     }
 #ifdef FEATURE_WLAN_ESE
     if ((csrIsProfileESE(pProfile) ||
-         ((pIesTemp->ESEVersion.present)
+         (HAL_STATUS_SUCCESS(status) && (pIesTemp->ESEVersion.present)
           && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM)
               || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA)
               || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK)
@@ -8992,6 +8995,11 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi
     tSmeCmd *pCommand = NULL;
 #if defined(FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_WAPI)
     tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+    if (NULL == pSession) {
+        VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+            FL("session %d not found"), sessionId);
+        return eHAL_STATUS_FAILURE;
+    }
 #endif /* FEATURE_WLAN_ESE */
 
     do