samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Check he_caps before dereferencing

Browse Source 
Before populating the nss information into the session,
for a connection, check if HE is supported and then
populate the configuration.

Change-Id: I422e4c388bc71133fec15d053e713b9d10149b09
CRs-Fixed: 2099374
This commit is contained in:
Varun Reddy Yeturu
2017-08-25 14:27:15 -07:00
committed by Anjaneedevi Kapparapu
parent bcb82d5fae
commit 5109486849
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/mac/src/pe/lim/lim_assoc_utils.c
View File

@@ -1781,7 +1781,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
lim_populate_he_mcs_set(pMac, pRates, he_caps, lim_populate_he_mcs_set(pMac, pRates, he_caps,
psessionEntry, psessionEntry->nss); psessionEntry, psessionEntry->nss);
if (IS_DOT11_MODE_HE(psessionEntry->dot11mode)) { if (IS_DOT11_MODE_HE(psessionEntry->dot11mode) && he_caps) {
psessionEntry->nss = he_caps->nss_supported; psessionEntry->nss = he_caps->nss_supported;
} else if (IS_DOT11_MODE_VHT(psessionEntry->dot11mode)) { } else if (IS_DOT11_MODE_VHT(psessionEntry->dot11mode)) {
if ((pRates->vhtRxMCSMap & MCSMAPMASK2x2) == MCSMAPMASK2x2) if ((pRates->vhtRxMCSMap & MCSMAPMASK2x2) == MCSMAPMASK2x2)
@@ -1789,6 +1789,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
} else if (pRates->supportedMCSSet[1] == 0) { } else if (pRates->supportedMCSSet[1] == 0) {
psessionEntry->nss = NSS_1x1_MODE; psessionEntry->nss = NSS_1x1_MODE;
} }
pe_debug("nss: %d", psessionEntry->nss);
return eSIR_SUCCESS; return eSIR_SUCCESS;
} /*** lim_populate_peer_rate_set() ***/ } /*** lim_populate_peer_rate_set() ***/