commit 1f11a39a748e9d60d8bb2584189750e1f63dc32e
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Thu Dec 27 17:31:42 2012 -0800
committer Madan Mohan Koyyalamudi <mkoyya@codeaurora.org> Thu Jan 10 23:49:57 2013 -0800
tree 551cb9e77bd7a2dcc43dee94a59ca0e1d35f84a8
parent 7b9d0c51e9ebc42b17875edd2ee972b3510d8ca7

wlan: Fix for the Memory Leak in wlan_qct_wdi.c

Fix for Memory Leak in wlan_qct_wdi.c because of allocating memory twice
in WDI_ProcessUpdateScanParamsReq

Change-Id: I2781c9f4003fcebd6ed5f64014d71c7366e400fa
CR-Fixed: 431412
(cherry picked from commit ab91c6b8e26b210fe86f9e930f8485ec4922f6c7)

CORE/WDI/CP/src/wlan_qct_wdi.c

diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 2c82099..0d23541 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -23000,10 +23000,8 @@
    WDI_UpdateScanParamsInfoType* pwdiUpdateScanParams  = NULL;
    WDI_UpdateScanParamsCb        wdiUpdateScanParamsCb = NULL;
    wpt_uint8*                    pSendBuffer           = NULL;
-   wpt_uint16                    usDataOffset          = 0;
    wpt_uint16                    usSendSize            = 0;
-   tUpdateScanParams             updateScanParams = {0};
-
+   WDI_Status                    wdiStatus;
 
    /*-------------------------------------------------------------------------
      Sanity check
@@ -23020,33 +23018,25 @@
 
    WPAL_TRACE( eWLAN_MODULE_DAL_CTRL,  eWLAN_PAL_TRACE_LEVEL_INFO,
                "Begin WDI Update Scan Parameters");
-   /*-----------------------------------------------------------------------
-     Get message buffer
-   -----------------------------------------------------------------------*/
-   if (( WDI_STATUS_SUCCESS != WDI_GetMessageBuffer( pWDICtx, WDI_UPDATE_SCAN_PARAMS_REQ,
-                         sizeof(updateScanParams),
-                         &pSendBuffer, &usDataOffset, &usSendSize))||
-       ( usSendSize < (usDataOffset + sizeof(updateScanParams) )))
-   {
-      WPAL_TRACE( eWLAN_MODULE_DAL_CTRL,  eWLAN_PAL_TRACE_LEVEL_WARN,
-                  "Unable to get send buffer in Update Scan Params req %x %x %x",
-                  pEventData, pwdiUpdateScanParams, wdiUpdateScanParamsCb);
-      WDI_ASSERT(0);
-      return WDI_STATUS_E_FAILURE;
-   }
 
    //
    // Fill updateScanParams from pwdiUpdateScanParams->wdiUpdateScanParamsInfo
    //
    if ( pWDICtx->wlanVersion.revision < 1 ) 
    {
-     WDI_PackUpdateScanParamsReq( pWDICtx, pwdiUpdateScanParams,
+     wdiStatus = WDI_PackUpdateScanParamsReq( pWDICtx, pwdiUpdateScanParams,
                                   &pSendBuffer, &usSendSize);
    }
    else
    {
-     WDI_PackUpdateScanParamsReqEx( pWDICtx, pwdiUpdateScanParams,
-                                    &pSendBuffer, &usSendSize);
+     wdiStatus = WDI_PackUpdateScanParamsReqEx( pWDICtx, pwdiUpdateScanParams,
+                                  &pSendBuffer, &usSendSize);
+   }
+   
+   if(WDI_STATUS_SUCCESS != wdiStatus)
+   {
+        //memory allocation failed
+        return WDI_STATUS_E_FAILURE;
    }
 
    /*-------------------------------------------------------------------------