diff options
| author | Kai Liu <kaliu@codeaurora.org> | 2016-10-24 13:29:12 +0800 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-10-25 11:53:38 +0530 |
| commit | 99558c142e492f256f83f7ecce7c662c07f95742 (patch) | |
| tree | 070de4490f5d73cae15c8cb7895571df537e0479 | |
| parent | 295101368e1ce8db190ad2d2ffee1ef4e193faa1 (diff) | |
qcacld-2.0: Add adapter null pointer check when restart tdls timer
Add null pointer check of adapter when restart tdls timer.
Change-Id: I78f244ad1a7ba21b3fad9cee8ec4e633bfe17a28
CRs-Fixed: 1080104
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_tdls.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c index a893ce318a22..fc053af4d052 100644 --- a/CORE/HDD/src/wlan_hdd_tdls.c +++ b/CORE/HDD/src/wlan_hdd_tdls.c @@ -2904,18 +2904,25 @@ void wlan_hdd_tdls_timer_restart(hdd_adapter_t *pAdapter, vos_timer_t *timer, v_U32_t expirationTime) { - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + hdd_station_ctx_t *pHddStaCtx; - /* Check whether driver load unload is in progress */ - if (vos_is_load_unload_in_progress(VOS_MODULE_ID_VOSS, NULL)) { - hddLog(LOGE, FL("Driver load/unload is in progress.")); - return; - } + if (NULL == pAdapter || WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, + FL("invalid pAdapter: %p"), pAdapter); + return; + } - if (hdd_connIsConnected(pHddStaCtx)) { - vos_timer_stop(timer); - vos_timer_start(timer, expirationTime); - } + pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + /* Check whether driver load unload is in progress */ + if (vos_is_load_unload_in_progress(VOS_MODULE_ID_VOSS, NULL)) { + hddLog(LOGE, FL("Driver load/unload is in progress.")); + return; + } + + if (hdd_connIsConnected(pHddStaCtx)) { + vos_timer_stop(timer); + vos_timer_start(timer, expirationTime); + } } void wlan_hdd_tdls_indicate_teardown(hdd_adapter_t *pAdapter, |