commit 51a5ad13af0f46a49765fc8946f1ed9a46c87747
author Ratnam Rachuri <c_rrachu@qti.qualcomm.com> Fri Aug 07 14:06:37 2015 +0530
committer Satyanarayana Dash <sadash@codeaurora.org> Fri Aug 07 19:21:19 2015 +0530
tree b5c36ad96796c926973a8146c53b6c1ee892c30d
parent 8fe90c64685e98a8196a9c87d02e02a3be0440c8

prima: Fix buffer overwrite problem in GETSCANHOMEAWAYTIME

qcacld-2.0 to prima propagation

If (len + 1) is greater than priv_data.total_len then copy_to_user
results in writing more data than the buffer can hold.
Fix this by writing mininum of (len + 1) and priv_data.total_len

CRs-Fixed: 865548
Change-Id: Ided39e1b788447093334789018a8571c7be51f11

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 a01f055..d50d5c5 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3371,8 +3371,8 @@
            tANI_U8 len = 0;
 
            len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
-           if (copy_to_user(priv_data.buf, &extra, len + 1))
-           {
+           len = VOS_MIN(priv_data.total_len, len + 1);
+           if (copy_to_user(priv_data.buf, &extra, len)) {
                VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                   "%s: failed to copy data to user buffer", __func__);
                ret = -EFAULT;