DivestOS/Patches/Linux_CVEs/CVE-2017-11060/ANY/2.patch

37 lines
1.4 KiB
Diff
Raw Normal View History

From 49eec96af9448e23a8fc2e41f67db948983b8427 Mon Sep 17 00:00:00 2001
From: Ecco Park <eccopark@google.com>
Date: Wed, 16 Aug 2017 16:45:03 -0700
Subject: [PATCH] qcacld-2.0: Avoid buffer overread when parsing PNO commands
fix merge of 5204ea3cae1b07aad76d9d831e46dfaea492f488
Bug: 36817548
Change-Id: Ie5abe6ed5797588688f3a83cf12a964429ed11d3
Signed-off-by: Ecco Park <eccopark@google.com>
---
drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c
index da139cf225ce2..9029ef3b9e4a3 100644
--- a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4873,7 +4873,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy,
}
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_PNO_MAX, data, data_len,
- wlan_hdd_extscan_config_policy)) {
+ wlan_hdd_pno_config_policy)) {
hddLog(LOGE, FL("Invalid ATTR"));
return -EINVAL;
}
@@ -4994,7 +4994,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy,
}
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_PNO_MAX, data, data_len,
- wlan_hdd_pno_config_policy)) {
+ wlan_hdd_extscan_config_policy)) {
hddLog(LOGE, FL("Invalid ATTR"));
return -EINVAL;
}