From 55aaaad92153dba6515969f8b9880a5e13e39f17 Mon Sep 17 00:00:00 2001 From: Arif Hussain Date: Wed, 14 Feb 2018 12:23:26 -0800 Subject: [PATCH] qcacld-3.0: Set copy_to_user flag on ftm rsp command If command type is FTM_IOCTL_UNIFIED_UTF_RSP set copy_to_user flag to return proper data to userspace. Change-Id: I5f4a1e147f3d1dc162001ceb69fa6823b3158787 CRs-Fixed: 2191046 --- core/hdd/src/wlan_hdd_ftm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 34d85c128373..b806ba18a737 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -54,12 +54,12 @@ #include "wlan_hdd_cfg80211.h" #include "hif.h" #include +#include -#define MAX_UTF_LENGTH 1024 struct qcmbr_data { unsigned int cmd; unsigned int length; - unsigned char buf[MAX_UTF_LENGTH + 4]; + unsigned char buf[WLAN_FTM_DATA_MAX_LEN + 4]; unsigned int copy_to_user; }; @@ -144,9 +144,9 @@ static int wlan_hdd_qcmbr_compat_ioctl(struct hdd_adapter *adapter, } ret = wlan_hdd_qcmbr_command(adapter, qcmbr_data); - if ((ret == 0) && qcmbr_data->copy_to_user) { + if ((ret == 0) && (qcmbr_data->cmd == 0x1001)) { ret = copy_to_user(ifr->ifr_data, qcmbr_data->buf, - (MAX_UTF_LENGTH + 4)); + (WLAN_FTM_DATA_MAX_LEN + 4)); } exit: @@ -183,9 +183,9 @@ static int wlan_hdd_qcmbr_ioctl(struct hdd_adapter *adapter, struct ifreq *ifr) } ret = wlan_hdd_qcmbr_command(adapter, qcmbr_data); - if ((ret == 0) && qcmbr_data->copy_to_user) { + if ((ret == 0) && (qcmbr_data->cmd == 0x1001)) { ret = copy_to_user(ifr->ifr_data, qcmbr_data->buf, - (MAX_UTF_LENGTH + 4)); + (WLAN_FTM_DATA_MAX_LEN + 4)); } exit: