summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Girigowda <sgirigow@qca.qualcomm.com>2015-07-07 13:31:30 -0700
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2015-07-10 20:33:30 +0530
commit409fbb32c083bd97705959ace8b09fac480824cf (patch)
treed07cd088365dd13bda5d6e682adf48ec8dbc4743
parentf5b8dbc951043d9195207125553219f9f126e35a (diff)
qcacld-2.0: Fix buffer overwrite problem in GETROAMINTRABAND
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: I1350af18469ad47b344f47c94577a11bb7b2074b CRs-Fixed: 865553
-rwxr-xr-xCORE/HDD/src/wlan_hdd_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index ded53ddfdd8c..92173d41370d 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -4802,8 +4802,8 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter,
/* value is interms of msec */
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETROAMINTRABAND", 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;