samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Avoid overflow of "set_bssid_hotlist" params

Browse Source 
This is a qcacld-2.0 to qcacld-3.0 propagation.

The wlan driver supports the following vendor command:
	QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_BSSID_HOTLIST

This command supplies a "number of APs" attribute as well as a list of
per-AP attributes.  However there is no validation that the number of
APs provided won't overflow the destination buffer.  In addition there
is no validation that the number of APs actually provided matches the
number of APs expected.

To address these issues:
* Verify that the expected number of APs doesn't exceed the maximum
  allowed number of APs
* Verify that the actual number of APs supplied doesn't exceed the
  expected number of APs
* Only process the actual number of supplied APs if it is less than
  the expected number of APs.

Change-Id: I41e36d11bc3e71928866a27afc2fbf046b59f0f5
CRs-Fixed: 1095770
This commit is contained in:
Srinivas Girigowda
2016-12-07 14:35:39 -08:00
committed by qcabuildsw
parent 0a85ccd9aa
commit 60a4f9dde9
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/hdd/src/wlan_hdd_ext_scan.c
View File

@@ -2074,6 +2074,11 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
pReqMsg->numAp = pReqMsg->numAp =
nla_get_u32(tb nla_get_u32(tb
[QCA_WLAN_VENDOR_ATTR_EXTSCAN_BSSID_HOTLIST_PARAMS_NUM_AP]); [QCA_WLAN_VENDOR_ATTR_EXTSCAN_BSSID_HOTLIST_PARAMS_NUM_AP]);
if (pReqMsg->numAp > WLAN_EXTSCAN_MAX_HOTLIST_APS) {
hdd_err("Number of AP: %u exceeds max: %u",
pReqMsg->numAp, WLAN_EXTSCAN_MAX_HOTLIST_APS);
goto fail;
}
pReqMsg->sessionId = pAdapter->sessionId; pReqMsg->sessionId = pAdapter->sessionId;
hdd_notice("Number of AP %d Session Id %d", hdd_notice("Number of AP %d Session Id %d",
pReqMsg->numAp, pReqMsg->sessionId); pReqMsg->numAp, pReqMsg->sessionId);
@@ -2093,6 +2098,11 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
nla_for_each_nested(apTh, nla_for_each_nested(apTh,
tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM], tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM],
rem) { rem) {
if (i == pReqMsg->numAp) {
hdd_warn("Ignoring excess AP");
break;
}
if (nla_parse if (nla_parse
(tb2, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX, (tb2, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX,
nla_data(apTh), nla_len(apTh), nla_data(apTh), nla_len(apTh),
@@ -2138,6 +2148,12 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
i++; i++;
} }
if (i < pReqMsg->numAp) {
hdd_warn("Number of AP %u less than expected %u",
i, pReqMsg->numAp);
pReqMsg->numAp = i;
}
context = &ext_scan_context; context = &ext_scan_context;
spin_lock(&context->context_lock); spin_lock(&context->context_lock);
INIT_COMPLETION(context->response_event); INIT_COMPLETION(context->response_event);