diff options
| author | Kanchanapally, Vidyullatha <vkanchan@qti.qualcomm.com> | 2015-07-17 11:20:21 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-07-17 06:39:13 -0700 |
| commit | eeabc338db4e54ffbd098ec0c18c494d54da8ba7 (patch) | |
| tree | 6fee98c4a9507b5a3af699456deb8dd28d3fce35 | |
| parent | 69ca8d885cc01ae62ee6ef83e025d55b72c4f615 (diff) | |
qcacld-2.0: Fix suspicious pointer dereference before NULL check
This change contains a fix for a suspicious pointer dereference
before a NULL check.
Change-Id: I855f6c903680208cc715cef7db919b856206c376
CRs-Fixed: 873955
| -rw-r--r-- | CORE/SERVICES/WMA/wma.c | 4 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 6d70b0e85f83..0cf6efed8dcd 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -15133,10 +15133,10 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) (params->htCapable || params->vhtCapable)) wma_set_ppsconfig(params->smesessionId, WMA_VHT_PPS_DELIM_CRC_FAIL, 1); - iface->aid = params->assocId; + iface->aid = params->assocId; + params->nss = iface->nss; out: params->status = status; - params->nss = iface->nss; /* change logging before release */ #ifdef WLAN_FEATURE_ROAM_OFFLOAD if(iface && iface->roam_synch_in_progress) diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 639da01e0fa5..9283987a3df9 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -16650,13 +16650,7 @@ eHalStatus sme_update_nss(tHalHandle h_hal, uint8_t nss) for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (CSR_IS_SESSION_VALID(mac_ctx, i)) { - csr_session = CSR_GET_SESSION(mac_ctx, i); - if (!csr_session) { - smsLog(mac_ctx, LOGE, - FL("Session does not exist for interface %d"), - i); - continue; - } + csr_session = &mac_ctx->roam.roamSession[i]; csr_session->htConfig.ht_tx_stbc = uHTCapabilityInfo.ht_cap_info.txSTBC; } |