summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com>2014-07-08 15:48:11 +0530
committerPitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com>2014-07-09 12:13:56 +0530
commit89482e1a8494fec5a33ef9a6ced0a84fee80e784 (patch)
treed3951441af136ae019de24e5beb6d73b71890260
parent9d97378b00188ff3a713d229a199689d72c932f0 (diff)
wlan: Static analysis error fix
Fixing Static analysis errors in limProcessSmeReqMessages.c and sme_Api.c Change-Id: Ib11d130e008c6d46a5f77109bd2e2964446f1c5b CRs-Fixed: 690457
-rw-r--r--CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c17
-rw-r--r--CORE/SME/src/sme_common/sme_Api.c8
2 files changed, 14 insertions, 11 deletions
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 500375b82804..b324740f527e 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -1461,12 +1461,23 @@ __limProcessSmeScanReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
// Initialize this buffer
vos_mem_set( (tANI_U8 *) pMlmScanReq, len, 0);
- pMlmScanReq->channelList.numChannels =
- pScanReq->channelList.numChannels;
+ if (pScanReq->channelList.numChannels <= SIR_ESE_MAX_MEAS_IE_REQS)
+ {
+ pMlmScanReq->channelList.numChannels =
+ pScanReq->channelList.numChannels;
+ }
+ else
+ {
+ limLog(pMac, LOGE,
+ FL("numChannels is more than the size(%d)"),
+ pScanReq->channelList.numChannels);
+ pMlmScanReq->channelList.numChannels =
+ SIR_ESE_MAX_MEAS_IE_REQS;
+ }
vos_mem_copy( pMlmScanReq->channelList.channelNumber,
pScanReq->channelList.channelNumber,
- pScanReq->channelList.numChannels);
+ pMlmScanReq->channelList.numChannels);
}
pMlmScanReq->uIEFieldLen = pScanReq->uIEFieldLen;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 7a1fa5153a40..1ad613677189 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -12762,14 +12762,6 @@ VOS_STATUS sme_UpdateDSCPtoUPMapping( tHalHandle hHal,
}
pCsrSession = CSR_GET_SESSION( pMac, sessionId );
- if (pCsrSession == NULL)
- {
- VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: CSR Session lookup fails %u", __func__, sessionId);
- sme_ReleaseGlobalLock( &pMac->sme);
- return eHAL_STATUS_FAILURE;
- }
-
pSession = peFindSessionByBssid( pMac,
pCsrSession->connectedProfile.bssid, &peSessionId );