commit a006c12cdfb99d647cf9502d2819d7e9e5f109ac
author Siddharth Bhal <sbhal@qti.qualcomm.com> Sat May 03 12:13:27 2014 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Thu May 08 10:48:41 2014 -0700
tree b49ada06df20b5f9a9d0e0a3f36b6b4b3539014d
parent 40e595a3b33acd10de0ad4b458277af7525f22e0

wlan: WDA: prevent null pointer dereference

Made change to avoid null pointer dereference.

Change-Id: Iffcb4df0f5b283c4d283272e3fc9d05d92f745a4
Crs-Fixed: 658814

CORE/WDA/src/wlan_qct_wda.c

diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 6eefc80..8491297 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -6096,26 +6096,28 @@
  */
 void WDA_UpdateChReqCallback(WDI_Status status, void* pUserData)
 {
-   tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
-   WDI_UpdateChReqParamsType *pwdiUpdateChReqParam =
-       (WDI_UpdateChReqParamsType *)pWdaParams->wdaWdiApiMsgParam;
-   WDI_UpdateChannelReqType *pwdiUpdateChanReqType =
-      &pwdiUpdateChReqParam->wdiUpdateChanParams;
-   WDI_UpdateChannelReqinfoType *pChanInfoType =
-       pwdiUpdateChanReqType->pchanParam;
-   tSirUpdateChanList *pChanList =
-       (tSirUpdateChanList *)pWdaParams->wdaMsgParam;
+   tWDA_ReqParams *pWdaParams;
+   WDI_UpdateChReqParamsType *pwdiUpdateChReqParam;
+   WDI_UpdateChannelReqType *pwdiUpdateChanReqType;
+   WDI_UpdateChannelReqinfoType *pChanInfoType;
+   tSirUpdateChanList *pChanList;
 
    VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
                                           "<------ %s " ,__func__);
-   if(NULL == pWdaParams)
+   if(NULL == pUserData)
    {
       VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
-              "%s: pWdaParams received NULL", __func__);
+              "%s: pUserData received NULL", __func__);
       VOS_ASSERT(0);
       return;
    }
 
+   pWdaParams = (tWDA_ReqParams *)pUserData;
+   pwdiUpdateChReqParam =
+       (WDI_UpdateChReqParamsType *)pWdaParams->wdaWdiApiMsgParam;
+   pwdiUpdateChanReqType = &pwdiUpdateChReqParam->wdiUpdateChanParams;
+   pChanInfoType = pwdiUpdateChanReqType->pchanParam;
+   pChanList = (tSirUpdateChanList *)pWdaParams->wdaMsgParam;
    /*
     * currently there is no response message is expected between PE and
     * WDA, Failure return from WDI is a ASSERT condition