diff options
| author | Edhar, Mahesh Kumar <c_medhar@qti.qualcomm.com> | 2015-07-08 13:36:39 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-07-10 20:33:31 +0530 |
| commit | 8999e6c2d03211cda8d200c9ab1b5bb8ea901fab (patch) | |
| tree | 4bd6fc20b38861ff7ea11b2f5966dfda2763ee7e | |
| parent | 904ea8413b821f69e5f23eca390fb40a08e93f9f (diff) | |
qcacld-2.0: Validate global MAC context before dereference
During driver load failure scenario's, we are not validating the
global mac context before dereferencing resulting in crash.
Change made to validate the global mac context.
Change-Id: I19f92f7896affa1cdf6c59c2a2cd4197ee94e68b
CRs-Fixed: 867435
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 3 | ||||
| -rw-r--r-- | CORE/SYS/legacy/src/system/src/macInitApi.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index d107a627ca5e..62e6c265aba6 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -3232,6 +3232,9 @@ eHalStatus sme_Close(tHalHandle hHal) eHalStatus fail_status = eHAL_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); + if (!pMac) + return eHAL_STATUS_FAILURE; + /* Note: pSession will be invalid from here on, do not access */ status = csrClose(pMac); if ( ! HAL_STATUS_SUCCESS( status ) ) { diff --git a/CORE/SYS/legacy/src/system/src/macInitApi.c b/CORE/SYS/legacy/src/system/src/macInitApi.c index b2f9e3555f2e..65c16cccda67 100644 --- a/CORE/SYS/legacy/src/system/src/macInitApi.c +++ b/CORE/SYS/legacy/src/system/src/macInitApi.c @@ -258,6 +258,9 @@ tSirRetStatus macClose(tHalHandle hHal) tpAniSirGlobal pMac = (tpAniSirGlobal) hHal; uint8_t i =0; + if (!pMac) + return eHAL_STATUS_FAILURE; + peClose(pMac); pMac->psOffloadEnabled = FALSE; |