Skip to content

Commit e95be12

Browse files
gbhat-marvellSomasundaram Krishnasamy
authored andcommitted
mwifiex: fix possible heap overflow in mwifiex_process_country_ie()
mwifiex_process_country_ie() function parse elements of bss descriptor in beacon packet. When processing WLAN_EID_COUNTRY element, there is no upper limit check for country_ie_len before calling memcpy. The destination buffer domain_info->triplet is an array of length MWIFIEX_MAX_TRIPLET_802_11D(83). The remote attacker can build a fake AP with the same ssid as real AP, and send malicous beacon packet with long WLAN_EID_COUNTRY elemen (country_ie_len > 83). Attacker can force STA connect to fake AP on a different channel. When the victim STA connects to fake AP, will trigger the heap buffer overflow. Fix this by checking for length and if found invalid, don not connect to the AP. This fix addresses CVE-2019-14895. Reported-by: huangwen <[email protected]> Signed-off-by: Ganapathi Bhat <[email protected]> Signed-off-by: Kalle Valo <[email protected]> (cherry picked from commit 3d94a4a) Orabug: 30781857 CVE: CVE-2019-14895 Signed-off-by: Vijayendra Suman <[email protected]> Reviewed-by: Allen Pais <[email protected]> Signed-off-by: Somasundaram Krishnasamy <[email protected]>
1 parent c4f555d commit e95be12

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

drivers/net/wireless/marvell/mwifiex/sta_ioctl.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,14 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv,
271271
"11D: skip setting domain info in FW\n");
272272
return 0;
273273
}
274+
275+
if (country_ie_len >
276+
(IEEE80211_COUNTRY_STRING_LEN + MWIFIEX_MAX_TRIPLET_802_11D)) {
277+
mwifiex_dbg(priv->adapter, ERROR,
278+
"11D: country_ie_len overflow!, deauth AP\n");
279+
return -EINVAL;
280+
}
281+
274282
memcpy(priv->adapter->country_code, &country_ie[2], 2);
275283

276284
domain_info->country_code[0] = country_ie[2];
@@ -314,8 +322,9 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
314322
priv->scan_block = false;
315323

316324
if (bss) {
317-
if (adapter->region_code == 0x00)
318-
mwifiex_process_country_ie(priv, bss);
325+
if (adapter->region_code == 0x00 &&
326+
mwifiex_process_country_ie(priv, bss))
327+
return -EINVAL;
319328

320329
/* Allocate and fill new bss descriptor */
321330
bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor),

0 commit comments

Comments
 (0)