Skip to content

Commit 3d94a4a

Browse files
gbhat-marvellKalle Valo
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]>
1 parent 6f3aeb1 commit 3d94a4a

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
@@ -229,6 +229,14 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv,
229229
"11D: skip setting domain info in FW\n");
230230
return 0;
231231
}
232+
233+
if (country_ie_len >
234+
(IEEE80211_COUNTRY_STRING_LEN + MWIFIEX_MAX_TRIPLET_802_11D)) {
235+
mwifiex_dbg(priv->adapter, ERROR,
236+
"11D: country_ie_len overflow!, deauth AP\n");
237+
return -EINVAL;
238+
}
239+
232240
memcpy(priv->adapter->country_code, &country_ie[2], 2);
233241

234242
domain_info->country_code[0] = country_ie[2];
@@ -272,8 +280,9 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
272280
priv->scan_block = false;
273281

274282
if (bss) {
275-
if (adapter->region_code == 0x00)
276-
mwifiex_process_country_ie(priv, bss);
283+
if (adapter->region_code == 0x00 &&
284+
mwifiex_process_country_ie(priv, bss))
285+
return -EINVAL;
277286

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

0 commit comments

Comments
 (0)