commit 8c6884c86a808c76a8abc80ac56c0e47baf303ec
author Linux Build Service Account <lnxbuild@localhost> Thu Feb 18 11:51:40 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 18 11:51:40 2016 -0800
tree cf9209cb93f42ea511b2cb79db5ac05d64f93a68
parent c6b0a92c592d3b8e012dca1be301c0d33df2fcfb
parent fb91cd7d3fbaebb6d62405cc2813a79a04d7dcb2

Merge "Wlan: Use proper length to copy channel avoid ind in WDI from FW"

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 3aaf0f1..067f275 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -31034,6 +31034,7 @@
   WDI_LowLevelIndType  wdiInd;
   tHalAvoidFreqRangeIndParams chAvoidIndicationParam;
   wpt_uint16           rangeLoop;
+  wpt_uint32           dataSize;
   /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
   /*-------------------------------------------------------------------------
@@ -31048,12 +31049,16 @@
      return WDI_STATUS_E_FAILURE;
   }
 
+  dataSize = sizeof(tHalAvoidFreqRangeIndParams);
+  if (dataSize > pEventData->uEventDataSize)
+    dataSize = pEventData->uEventDataSize;
+
   /*-------------------------------------------------------------------------
   Extract indication and send it to UMAC
  -------------------------------------------------------------------------*/
   wpalMemoryCopy(&chAvoidIndicationParam,
                  pEventData->pEventData,
-                 sizeof(tHalAvoidFreqRangeIndParams));
+                 dataSize);
 
   /* Avoid Over flow */
   if (WLAN_HAL_MAX_AVOID_FREQ_RANGE < chAvoidIndicationParam.avoidCnt)