commit 292d2bb2f13a31aefd113ff43a679bf68f01501b
author Rajeev Kumar <rajekuma@qca.qualcomm.com> Wed Oct 23 15:01:44 2013 -0700
committer Kiet Lam <c_kietl@qca.qualcomm.com> Mon Oct 28 17:23:38 2013 -0700
tree d9f0d51297efacc0377e2901a3ba0bff619a2cf3
parent 7dc7ead3a1a381bff5981e9e0b62d6c073f5ecdb

wlan: Fix batch scan response string format

Fixing additional space before BSSID in batch scan response

Change-Id: I133242e5e93cc29640f00c8b5169a997db43ef1a
CRs-Fixed: 565893

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index a7afa2c..d60a467 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1310,6 +1310,7 @@
          len = hdd_format_batch_scan_rsp(pDest, cur_len, rem_len, pHead,
                    pAdapter);
          pDest += len;
+         pDest--;
          cur_len += len;
          if(TRUE == pAdapter->isTruncated)
          {
@@ -3268,6 +3269,8 @@
        }
        else if (strncmp(command, "WLS_BATCHING GET", 16) == 0)
        {
+          tANI_U32 remain_len;
+
           if (FALSE == sme_IsFeatureSupportedByFW(BATCH_SCAN))
           {
               VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -3289,6 +3292,21 @@
           }
 
           priv_data.used_len = 16;
+          remain_len = priv_data.total_len - priv_data.used_len;
+          if (remain_len < priv_data.total_len)
+          {
+              /*Clear previous batch scan response data if any*/
+              vos_mem_zero((tANI_U8 *)(command + priv_data.used_len), remain_len);
+          }
+          else
+          {
+              VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+                "Invalid total length from user space can't fetch batch"
+                " scan response total_len %ld used_len %ld remain len %ld",
+                priv_data.total_len, priv_data.used_len, remain_len);
+              ret = -EINVAL;
+              goto exit;
+          }
           ret = hdd_return_batch_scan_rsp_to_user(pAdapter, &priv_data, command);
        }
 #endif