wlan: Fix for Statis analysis errors in SME module
It will fix all critical errors reported in SME
module by statis analysis tool.
Change-Id: Ie083a3a12a36ec4bacb0eb4abd7e26f923808af9
CRs-Fixed: 609608
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 75641a5..6b8323c 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -2429,7 +2429,21 @@
VOS_ASSERT(0);
return eHAL_STATUS_FAILURE;
}
- if(eCSR_ROAM_ASSOCIATION_COMPLETION == u1 && pRoamInfo)
+
+ if (eANI_BOOLEAN_FALSE == pSession->sessionActive)
+ {
+ smsLog(pMac, LOG1, "%s Session is not Active", __func__);
+ return eHAL_STATUS_FAILURE;
+ }
+ if (NULL == pRoamInfo)
+ {
+ smsLog(pMac, LOGE, "%s: pRoamInfo is NULL", __func__);
+ VOS_ASSERT(0);
+ return eHAL_STATUS_FAILURE;
+ }
+ smsLog(pMac, LOG4, "Recieved RoamCmdStatus %d with Roam Result %d", u1, u2);
+
+ if(eCSR_ROAM_ASSOCIATION_COMPLETION == u1)
{
smsLog(pMac, LOGW, " Assoc complete result = %d statusCode = %d reasonCode = %d", u2, pRoamInfo->statusCode, pRoamInfo->reasonCode);
}
@@ -2447,13 +2461,6 @@
pSession->bRefAssocStartCnt--;
}
- if ( (pSession == NULL) ||
- (eANI_BOOLEAN_FALSE == pSession->sessionActive) )
- {
- smsLog(pMac, LOG1, "Session ID is not valid");
- return eHAL_STATUS_FAILURE;
- }
-
if(NULL != pSession->callback)
{
if( pRoamInfo )
@@ -5900,8 +5907,6 @@
if( CSR_IS_SESSION_VALID(pMac, sessionId) )
{
pSession = CSR_GET_SESSION(pMac, sessionId);
- if (!pSession)
- break;
if ( CSR_IS_INFRA_AP(&pSession->connectedProfile) )
{
@@ -9142,10 +9147,13 @@
tCsrRoamSession *pSession = NULL;
tpSirSmeSwitchChannelInd pSwitchChnInd;
tSmeMaxAssocInd *pSmeMaxAssocInd;
- pSirMsg->messageType = (pSirMsg->messageType);
- pSirMsg->length = (pSirMsg->length);
- pSirMsg->statusCode = (pSirMsg->statusCode);
vos_mem_set(&roamInfo, sizeof(roamInfo), 0);
+
+
+ if (NULL == pSirMsg)
+ { smsLog(pMac, LOGE, FL("pSirMsg is NULL"));
+ return;
+ }
switch( pSirMsg->messageType )
{
case eWNI_SME_ASSOC_IND:
@@ -9422,11 +9430,6 @@
if( CSR_IS_SESSION_VALID(pMac, sessionId) )
{
pSession = CSR_GET_SESSION(pMac, sessionId);
- if(!pSession)
- {
- smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
- return;
- }
if ( CSR_IS_INFRA_AP(&pSession->connectedProfile) )
{
pRoamInfo = &roamInfo;
@@ -9450,11 +9453,6 @@
if( CSR_IS_SESSION_VALID(pMac, sessionId) )
{
pSession = CSR_GET_SESSION(pMac, sessionId);
- if(!pSession)
- {
- smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
- return;
- }
if ( CSR_IS_INFRA_AP(&pSession->connectedProfile) )
{
pRoamInfo = &roamInfo;
@@ -15663,6 +15661,12 @@
return eHAL_STATUS_FAILURE;
}
pSession = CSR_GET_SESSION( pMac, sessionId );
+ if (NULL == pSession)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s:pSession is null", __func__);
+ return eHAL_STATUS_FAILURE;
+ }
pBssDesc = pSession->pConnectBssDesc;
if (pBssDesc == NULL)
{