From 5109486849421e63ed522c94fb09e2e82d61224f Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Fri, 25 Aug 2017 14:27:15 -0700 Subject: [PATCH] qcacld-3.0: Check he_caps before dereferencing 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 --- core/mac/src/pe/lim/lim_assoc_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index f0746b57a43c..50bc28ef15f5 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -1781,7 +1781,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, lim_populate_he_mcs_set(pMac, pRates, he_caps, 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; } else if (IS_DOT11_MODE_VHT(psessionEntry->dot11mode)) { if ((pRates->vhtRxMCSMap & MCSMAPMASK2x2) == MCSMAPMASK2x2) @@ -1789,6 +1789,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, } else if (pRates->supportedMCSSet[1] == 0) { psessionEntry->nss = NSS_1x1_MODE; } + pe_debug("nss: %d", psessionEntry->nss); return eSIR_SUCCESS; } /*** lim_populate_peer_rate_set() ***/