diff options
| author | Padma, Santhosh Kumar <skpadma@qti.qualcomm.com> | 2015-12-04 18:47:15 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-25 05:00:24 -0700 |
| commit | fd7336858f6919917ceeccae9209ef5dd94e6db8 (patch) | |
| tree | c96f27c47fa51812f0baec208112e5766ff46a52 | |
| parent | 9de8c5a41b3112b8496f927e424a67b8bc211627 (diff) | |
qcacld-2.0: Reset memory allocation of BSS description
prima to qcacld-2.0 propagation
In CCX, BSS description is sent as part of beacon report. If BSS
description has random values, it leads to CCX certification failure.
Fix this by resetting memory allocated with zero. Also, reset memory
allocated to send beacon report to avoid this issue.
Change-Id: I445942b64ca9f382f8d24ca19665d6bda2341a80
CRs-Fixed: 931441
| -rw-r--r-- | CORE/MAC/src/pe/lim/limScanResultUtils.c | 2 | ||||
| -rw-r--r-- | CORE/SME/src/rrm/sme_rrm.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c index db6c5f282456..09ec15a768e1 100644 --- a/CORE/MAC/src/pe/lim/limScanResultUtils.c +++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c @@ -523,6 +523,8 @@ limCheckAndAddBssDescription(tpAniSirGlobal pMac, return; } + vos_mem_zero(pBssDescr, frameLen); + // In scan state, store scan result. #if defined WLAN_FEATURE_VOWIFI limCollectBssDescription(pMac, &pBssDescr->bssDescription, diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c index 4d355653c6ae..feff4e197490 100644 --- a/CORE/SME/src/rrm/sme_rrm.c +++ b/CORE/SME/src/rrm/sme_rrm.c @@ -180,7 +180,7 @@ static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac, { tpSirBssDescription pBssDesc = NULL; tpSirBeaconReportXmitInd pBeaconRep; - tANI_U16 length, ie_len; + tANI_U16 length, ie_len, tot_len; tANI_U8 bssCounter=0, msgCounter=0; tCsrScanResultInfo *pCurResult=NULL; eHalStatus status = eHAL_STATUS_FAILURE; @@ -227,10 +227,13 @@ static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac, if(pBssDesc != NULL) { ie_len = GET_IE_LEN_IN_BSS( pBssDesc->length ); - pBeaconRep->pBssDescription[msgCounter] = vos_mem_malloc ( - ie_len+sizeof(tSirBssDescription)); + tot_len = ie_len+sizeof(tSirBssDescription); + pBeaconRep->pBssDescription[msgCounter] = + vos_mem_malloc(tot_len); if (NULL == pBeaconRep->pBssDescription[msgCounter]) break; + vos_mem_zero(pBeaconRep->pBssDescription[msgCounter], + tot_len); vos_mem_copy( pBeaconRep->pBssDescription[msgCounter], pBssDesc, sizeof(tSirBssDescription) ); |