summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-25 22:47:07 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-25 22:47:07 -0700
commit4f2d32e4734ed6239982d7af2af8c6036e3bc7c5 (patch)
treec17847474f19e7267660fa08fd202c89b63f2ca9
parente495cf618322283c8d6e0030e8b7debcb32692a8 (diff)
parentc00bc9322aeac5530e9c2cb92f6354dc8d047c50 (diff)
Merge "qcacld-2.0: Trim extn capability to max supported in change station" into wlan-cld2.driver.lnx.1.0-dev
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 5031b638f1b1..d7a4ac2e950c 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -18810,9 +18810,15 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
StaParams.supported_oper_classes_len =
params->supported_oper_classes_len;
+ if (params->ext_capab_len > sizeof(StaParams.extn_capability)) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "received extn capabilities:%d, resetting it to max supported",
+ params->ext_capab_len);
+ params->ext_capab_len = sizeof(StaParams.extn_capability);
+ }
if (0 != params->ext_capab_len)
vos_mem_copy(StaParams.extn_capability, params->ext_capab,
- sizeof(StaParams.extn_capability));
+ params->ext_capab_len);
if (NULL != params->ht_capa) {
StaParams.htcap_present = 1;