commit bc2fb5c0342851092cb794e37b9eab91633a712c
author Sushant Kaushik <skaushik@qti.qualcomm.com> Wed Jul 15 16:43:16 2015 +0530
committer Satyanarayana Dash <sadash@codeaurora.org> Wed Jul 15 19:52:49 2015 +0530
tree a7078a871f5b5e86be99e121d67472fb32380ebe
parent c9b8be56437e57fc58cff19c03870c02fc409de3

wlan: Fix buffer overwrite problem in GETOKCMODE

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.

Change-Id: Icb4256ccf4267305a333ca59c945a7ef7e85647a
CRs-Fixed: 865573

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 a8e9f78..cd77755 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -2882,7 +2882,8 @@
 
            len = scnprintf(extra, sizeof(extra), "%s %d",
                    "GETOKCMODE", okcMode);
-           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__);