diff options
| author | Sreelakshmi Konamki <skonam@codeaurora.org> | 2016-08-10 17:04:09 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-02 18:26:39 -0700 |
| commit | 9d866dfe20577ab1f38b80a64f4d33686aa79999 (patch) | |
| tree | fed939e6202aaa7e39ce590bae3fee18afce4051 | |
| parent | 96d62abc24f751b8abf53975aa78b023f485e90e (diff) | |
qcacld-3.0: Fix suspicious dereference of pointer
qcacld-2.0 to qcacld-3.0 propagation
Fix to add NULL check before dereferencing of pointer
Change-Id: I6cfbb5cb6a434a924e988bab50a5a062a2499ccf
CRs-Fixed: 1039152
| -rw-r--r-- | core/mac/src/pe/nan/nan_datapath.c | 2 | ||||
| -rw-r--r-- | core/wma/src/wma_power.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c index 030323ba2ed0..706f22ed76f9 100644 --- a/core/mac/src/pe/nan/nan_datapath.c +++ b/core/mac/src/pe/nan/nan_datapath.c @@ -722,11 +722,11 @@ void lim_process_ndi_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msgq, tLimMlmStartCnf mlm_start_cnf; tpAddBssParams add_bss_params = (tpAddBssParams) lim_msgq->bodyptr; - lim_log(mac_ctx, LOG1, FL("Status %d"), add_bss_params->status); if (NULL == add_bss_params) { lim_log(mac_ctx, LOGE, FL("Invalid body pointer in message")); goto end; } + lim_log(mac_ctx, LOG1, FL("Status %d"), add_bss_params->status); if (QDF_STATUS_SUCCESS == add_bss_params->status) { lim_log(mac_ctx, LOG1, FL("WDA_ADD_BSS_RSP returned QDF_STATUS_SUCCESS")); diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 390d66acda2f..3f2fa5321276 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -1949,11 +1949,13 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id) uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); + if (!mac) { + WMA_LOGE(FL("Failed to get mac context")); + return; + } /* Set Listen Interval */ - if ((NULL == mac) || (wlan_cfg_get_int(mac, - WNI_CFG_LISTEN_INTERVAL, - &cfg_data_val) != - eSIR_SUCCESS)) { + if ((wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, + &cfg_data_val) != eSIR_SUCCESS)) { QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get value for listen interval"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; |