diff options
| author | Naveen Rawat <naveenrawat@codeaurora.org> | 2017-01-12 16:56:43 -0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2017-01-12 22:44:46 -0800 |
| commit | e7158ddeb9cfcf28026ae10db9519b7bc2f13896 (patch) | |
| tree | 54545a91562318cbf09d9943365506c8ee80ac23 | |
| parent | ce0ed24d06efcb7f0c6477a5905c1c39c1625760 (diff) | |
qcacld-3.0: Fix NULL pointer dereference
Fix NULL pointer dereference.
Change-Id: If5032543798da87c83647899c1a0711ba924178a
CRs-Fixed: 1111041
| -rw-r--r-- | core/mac/src/pe/lim/lim_api.c | 5 | ||||
| -rw-r--r-- | core/sme/src/nan/nan_datapath_api.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 269673ed38df..63d090034697 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -2190,7 +2190,8 @@ void lim_update_lost_link_info(tpAniSirGlobal mac, tpPESession session, tSirMsgQ mmh_msg; if ((NULL == mac) || (NULL == session)) { - lim_log(mac, LOGE, FL("parameter NULL")); + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + FL("parameter NULL")); return; } if (!LIM_IS_STA_ROLE(session)) { diff --git a/core/sme/src/nan/nan_datapath_api.c b/core/sme/src/nan/nan_datapath_api.c index 2f4df9f12b79..9d09ab08c92c 100644 --- a/core/sme/src/nan/nan_datapath_api.c +++ b/core/sme/src/nan/nan_datapath_api.c @@ -473,8 +473,7 @@ QDF_STATUS csr_process_ndp_initiator_request(tpAniSirGlobal mac_ctx, if (NULL == cmd) { sms_log(mac_ctx, LOGE, FL("Invalid req_params")); - status = QDF_STATUS_E_INVAL; - goto sme_initiator_req_failed; + return QDF_STATUS_E_INVAL; } req = &cmd->u.initiator_req; |