diff options
| -rw-r--r-- | CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c | 17 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 8 |
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 ); |