diff options
| author | Yingying Tang <yintang@codeaurora.org> | 2016-10-20 17:10:34 +0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-11-09 18:52:27 -0800 |
| commit | 86afb596ea85af39084fafb0d91b1ade78d140d9 (patch) | |
| tree | bd7b90eb2187958732841f2c719d9a63ab10b85e | |
| parent | 5bc5a0e76eec1d7317df39c72a62a9723d1742f1 (diff) | |
qcacld-3.0: Fix incorrect NULL pointer check for MAC layer
Propagate from qcacld-2.0 to qcacld-3.0
Currently there are some places where array name is compared to NULL
in MAC. Add fix to correct it.
CRs-Fixed: 1063255
Change-Id: I4f620feff23475d0b719fae7ef8e0ac1ab3b8908
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 4 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_deauth_frame.c | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 359991de6e14..39ecda57c34e 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -533,10 +533,6 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("LFR3: Reassoc response packet header is NULL")); return; - } else if (hdr->sa == NULL) { - lim_log(mac_ctx, LOGE, - FL("LFR3: Reassoc resp packet source address is NULL")); - return; } lim_log(mac_ctx, LOG1, diff --git a/core/mac/src/pe/lim/lim_process_deauth_frame.c b/core/mac/src/pe/lim/lim_process_deauth_frame.c index 488782722246..6a434856408b 100644 --- a/core/mac/src/pe/lim/lim_process_deauth_frame.c +++ b/core/mac/src/pe/lim/lim_process_deauth_frame.c @@ -263,11 +263,10 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, * AP we're currently associated with (case a), then proceed * with normal deauth processing. */ - if (psessionEntry->limReAssocbssId != NULL) { - pRoamSessionEntry = - pe_find_session_by_bssid(pMac, psessionEntry->limReAssocbssId, - &roamSessionId); - } + pRoamSessionEntry = + pe_find_session_by_bssid(pMac, psessionEntry->limReAssocbssId, + &roamSessionId); + if (lim_is_reassoc_in_progress(pMac, psessionEntry) || lim_is_reassoc_in_progress(pMac, pRoamSessionEntry)) { if (!IS_REASSOC_BSSID(pMac, pHdr->sa, psessionEntry)) { |