commit 6dbcdbb852ada560857f3fb2bf72806f3687eebf
author Masti, Narayanraddi <c_nmasti@qti.qualcomm.com> Wed May 13 10:28:06 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Thu May 14 18:12:36 2015 +0530
tree 514a4009bb8001e04d1bbde67b2390c9c3e393b9
parent 700ab2cdefb74fc4629a7bdef1a524b44d5f1bd2

prima: Avoid crash in tdls packet count functionality

Currently, tdls lock is not acquired before proceeding further
to count tdls peer packets during which packet count
functionality may get preempted leading to crash.
To mitigate this make sure to acquire tdls lock before
proceeding further to count tdls peer packets.

Change-Id: I12d9774dab21e774e3315cf0b7cfd15ca6b3a01c
CRs-Fixed: 833500

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 9946451..80359ec 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8441,14 +8441,17 @@
         return -EBUSY;
     }
 
+    mutex_lock(&pHddCtx->tdls_lock);
     pTdlsPeer = wlan_hdd_tdls_get_peer(pAdapter, mac);
 
     if ( NULL == pTdlsPeer ) {
         VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                "%s: " MAC_ADDRESS_STR " (update %d) not exist. return invalid",
                __func__, MAC_ADDR_ARRAY(mac), update);
+        mutex_unlock(&pHddCtx->tdls_lock);
         return -EINVAL;
     }
+    mutex_unlock(&pHddCtx->tdls_lock);
 
     /* in add station, we accept existing valid staId if there is */
     if ((0 == update) &&
@@ -14987,13 +14990,16 @@
     /* To cater the requirement of establishing the TDLS link
      * irrespective of the data traffic , get an entry of TDLS peer.
      */
+    mutex_lock(&pHddCtx->tdls_lock);
     pTdlsPeer = wlan_hdd_tdls_get_peer(pAdapter, peer);
     if (pTdlsPeer == NULL) {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                   "%s: peer " MAC_ADDRESS_STR " not existing",
                   __func__, MAC_ADDR_ARRAY(peer));
+        mutex_unlock(&pHddCtx->tdls_lock);
         return -EINVAL;
     }
+    mutex_unlock(&pHddCtx->tdls_lock);
 
     /* check FW TDLS Off Channel capability */
     if ((TRUE == sme_IsFeatureSupportedByFW(TDLS_OFF_CHANNEL)) &&