commit 7923614331c4923b7108212432380208aa12229e
author Padma, Santhosh Kumar <skpadma@qti.qualcomm.com> Mon Feb 09 18:19:33 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Thu Apr 02 18:49:42 2015 +0530
tree 8200b6b78ed326434c8d2cf7ef95c062a3b4c786
parent 2187b8c19f4fffccf52ca5dc36ea55a7a7fca880

prima: Error handling for WLANTL_updateSpoofMacAddr

Variables spoofMacAddr, selfMacAddr passed to WLANTL_updateSpoofMacAddr
are static arrays. Removed redundant check as those variables can never
be NULL. Also, if status returned by WLANTL_updateSpoofMacAddr is not
success, return with appropriate status and free the memory.

Change-Id: I2c34c96d85de13ff86ff5af635c024e1bfa43f35
CRs-Fixed: 813774

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 413a974..8977e8d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -10729,8 +10729,15 @@
         /* Updating SelfSta Mac Addr in TL which will be used to get staidx
          * to fill TxBds for probe request during current scan
          */
-        WLANTL_updateSpoofMacAddr(pHddCtx->pvosContext,
+        status = WLANTL_updateSpoofMacAddr(pHddCtx->pvosContext,
             &pHddCtx->spoofMacAddr.randomMacAddr, &pAdapter->macAddressCurrent);
+
+        if(status != VOS_STATUS_SUCCESS)
+        {
+            hdd_allow_suspend();
+            status = -EFAULT;
+            goto free_mem;
+        }
     }
 
     status = sme_ScanRequest( WLAN_HDD_GET_HAL_CTX(pAdapter),

CORE/TL/src/wlan_qct_tl.c

diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index e6847b8..3366c58 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -3165,16 +3165,6 @@
   /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 
   /*------------------------------------------------------------------------
-    Sanity check
-   ------------------------------------------------------------------------*/
-  if ( NULL == spoofMacAddr || NULL == selfMacAddr)
-  {
-    VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
-           "WLAN TL:Invalid parameter sent on WLANTL_updateSpoofMacAddr");
-    return VOS_STATUS_E_INVAL;
-  }
-
-  /*------------------------------------------------------------------------
     Extract TL control block
    ------------------------------------------------------------------------*/
   pTLCb = VOS_GET_TL_CB(pvosGCtx);