Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-09-12 07:01:15 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-09-12 07:01:15 +0200
commit7b07ea6e21aa48d2911182232fc73f1ba8f6a852 (patch)
tree032e8fe05fa2e4eaabac829996f4b85c2b0b5b46
parent6e8dc7832e699ff562bf10b31f17f88ab90111a2 (diff)
parent4ca7881527a7d52e34570f869b9c5ace8ae9bfbc (diff)
Merge branch 'SLE12-SP5' into SLE12-SP5-AZURE
-rw-r--r--drivers/net/wireless/marvell/mwifiex/scan.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index 3cbccafad2b0..ed27147efcb3 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -1248,6 +1248,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
}
switch (element_id) {
case WLAN_EID_SSID:
+ if (element_len > IEEE80211_MAX_SSID_LEN)
+ return -EINVAL;
bss_entry->ssid.ssid_len = element_len;
memcpy(bss_entry->ssid.ssid, (current_ptr + 2),
element_len);
@@ -1257,6 +1259,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
break;
case WLAN_EID_SUPP_RATES:
+ if (element_len > MWIFIEX_SUPPORTED_RATES)
+ return -EINVAL;
memcpy(bss_entry->data_rates, current_ptr + 2,
element_len);
memcpy(bss_entry->supported_rates, current_ptr + 2,