TDLS: Address TDLS timer leaks due to improper TDLS cleanup
TDLS timers created for p2p client adapters are not getting freed
during TDLS cleanup if the adapter mode is set to p2p device results
in timer leak.
To mitigate this issue, move the logic of TDLS sta initiailization
and cleanup to tdls_connection_callback and tdls_disconnect_callback
functions respectively.
Change-Id: I50c033fe64fa7014231881287e665abdded46c61
CRs-Fixed: 775766
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 74c05a3..b9692d8 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -7430,26 +7430,8 @@
pAdapter->device_mode = (type == NL80211_IFTYPE_STATION) ?
WLAN_HDD_INFRA_STATION: WLAN_HDD_P2P_CLIENT;
}
-#ifdef FEATURE_WLAN_TDLS
- /* The open adapter for the p2p shall skip initializations in
- * tdls_init if the device mode is WLAN_HDD_P2P_DEVICE, for
- * TDLS is supported only on WLAN_HDD_P2P_CLIENT. Hence invoke
- * tdls_init when the change_iface sets the device mode to
- * WLAN_HDD_P2P_CLIENT.
- */
-
- if ( pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)
- {
- if (0 != wlan_hdd_sta_tdls_init (pAdapter))
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: tdls initialization failed", __func__);
- return -EINVAL;
- }
- }
-#endif
-
break;
+
case NL80211_IFTYPE_ADHOC:
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: setting interface Type to ADHOC", __func__);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 836bb8a..6a64e86 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -6242,23 +6242,8 @@
set_bit(WMM_INIT_DONE, &pAdapter->event_flags);
-#ifdef FEATURE_WLAN_TDLS
- if(0 != wlan_hdd_sta_tdls_init(pAdapter))
- {
- status = VOS_STATUS_E_FAILURE;
- hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wlan_hdd_sta_tdls_init failed",__func__);
- goto error_tdls_init;
- }
- set_bit(TDLS_INIT_DONE, &pAdapter->event_flags);
-#endif
-
return VOS_STATUS_SUCCESS;
-#ifdef FEATURE_WLAN_TDLS
-error_tdls_init:
- clear_bit(WMM_INIT_DONE, &pAdapter->event_flags);
- hdd_wmm_adapter_close(pAdapter);
-#endif
error_wmm_init:
clear_bit(INIT_TX_RX_SUCCESS, &pAdapter->event_flags);
hdd_deinit_tx_rx(pAdapter);
@@ -6332,14 +6317,6 @@
}
hdd_cleanup_actionframe(pHddCtx, pAdapter);
-#ifdef FEATURE_WLAN_TDLS
- if(test_bit(TDLS_INIT_DONE, &pAdapter->event_flags))
- {
- wlan_hdd_tdls_exit(pAdapter);
- clear_bit(TDLS_INIT_DONE, &pAdapter->event_flags);
- }
-#endif
-
break;
}
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index 22adb26..026a335 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -812,11 +812,12 @@
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX( pAdapter );
tdlsCtx_t *pHddTdlsCtx;
int i;
-
if (NULL == pHddCtx)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s pHddCtx is NULL", __func__);
return -1;
+ }
- mutex_lock(&pHddCtx->tdls_lock);
if ((FALSE == pHddCtx->cfg_ini->fEnableTDLSSupport) ||
(FALSE == sme_IsFeatureSupportedByFW(TDLS)))
@@ -826,7 +827,6 @@
hddLog(VOS_TRACE_LEVEL_ERROR, "%s TDLS not enabled (%d) or FW doesn't support (%d)!",
__func__, pHddCtx->cfg_ini->fEnableTDLSSupport,
sme_IsFeatureSupportedByFW(TDLS));
- mutex_unlock(&pHddCtx->tdls_lock);
return 0;
}
/* TDLS is supported only in STA / P2P Client modes,
@@ -841,7 +841,7 @@
*/
if (0 == WLAN_HDD_IS_TDLS_SUPPORTED_ADAPTER(pAdapter))
{
- mutex_unlock(&pHddCtx->tdls_lock);
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s TDLS is not supported in mode : %d", __func__, pAdapter->device_mode);
return 0;
}
/* Check for the valid pHddTdlsCtx. If valid do not further
@@ -908,7 +908,6 @@
INIT_WORK(&pHddTdlsCtx->implicit_setup, wlan_hdd_tdls_pre_setup);
INIT_DELAYED_WORK(&pHddCtx->tdls_scan_ctxt.tdls_scan_work, wlan_hdd_tdls_schedule_scan);
- mutex_unlock(&pHddCtx->tdls_lock);
return 0;
}
@@ -1223,7 +1222,7 @@
if ( NULL == pHddTdlsCtx )
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddTdlsCtx is NULL"));
+ FL("pHddTdlsCtx is NULL device mode = %d"), pAdapter->device_mode);
return -1;
}
@@ -1944,10 +1943,10 @@
void wlan_hdd_tdls_connection_callback(hdd_adapter_t *pAdapter)
{
- tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
+ tdlsCtx_t *pHddTdlsCtx;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx))
+ if ((NULL == pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
FL("pHddCtx or pHddTdlsCtx points to NULL"));
@@ -1956,6 +1955,22 @@
mutex_lock(&pHddCtx->tdls_lock);
+ if (0 != wlan_hdd_sta_tdls_init(pAdapter))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wlan_hdd_sta_tdls_init failed",__func__);
+ mutex_unlock(&pHddCtx->tdls_lock);
+ return;
+ }
+ set_bit(TDLS_INIT_DONE, &pAdapter->event_flags);
+
+ pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
+ if ((NULL == pHddTdlsCtx))
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
+ FL("pHddCtx or pHddTdlsCtx points to NULL device mode = %d"), pAdapter->device_mode);
+ mutex_unlock(&pHddCtx->tdls_lock);
+ return;
+ }
VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
"%s, update %d discover %d", __func__,
pHddTdlsCtx->threshold_config.tx_period_t,
@@ -2010,9 +2025,11 @@
pHddTdlsCtx->discovery_sent_cnt = 0;
wlan_hdd_tdls_check_power_save_prohibited(pHddTdlsCtx->pAdapter);
- wlan_hdd_tdls_monitor_timers_stop(pHddTdlsCtx);
- wlan_hdd_tdls_peer_timers_destroy(pHddTdlsCtx);
- wlan_hdd_tdls_free_list(pHddTdlsCtx);
+ if(test_bit(TDLS_INIT_DONE, &pAdapter->event_flags))
+ {
+ wlan_hdd_tdls_exit(pAdapter);
+ clear_bit(TDLS_INIT_DONE, &pAdapter->event_flags);
+ }
mutex_unlock(&pHddCtx->tdls_lock);
}