Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@suse.com>2019-09-11 14:30:51 +0300
committerDenis Kirjanov <dkirjanov@suse.com>2019-09-11 14:30:51 +0300
commit4ca7881527a7d52e34570f869b9c5ace8ae9bfbc (patch)
tree989a5d1679862d3b6f09c863d96dbb837d196b79
parent334c20c5b383939deba2fd207b9f65e14523af73 (diff)
parent0a77efee3a43844ab767caa82a5d392bb574a95c (diff)
Merge 'users/oneukum/SLE12-SP5/for-next' into SLE12-SP5
Pull a wireless fix from Oliver Neukum suse-commit: fd4c627b5ceae72114194a89d0e8bb4af974db89
-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,