mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings
PATCH 1/1 mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings
From: Wen Huang <[email protected]>
mwifiex_update_vs_ie(),mwifiex_set_uap_rates() and mwifiex_set_wmm_params() call memcpy() without checking the destination size.Since the source is given from user-space, this may trigger a heap buffer overflow.
Fix them by putting the length check before performing memcpy().
This fix addresses CVE-2019-14814,CVE-2019-14815,CVE-2019-14816.
--- drivers/net/wireless/marvell/mwifiex/ie.c | 3 +++ drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/ie.c +3 -0
@@ -241,6 +241,9 @@ static int mwifiex_update_vs_ie(const u8 *ies, int ies_len, } vs_ie = (struct ieee_types_header *)vendor_ie; +if (le16_to_cpu (ie->ie_length) + vs_ie->len +2 > +IEEE_MAX_IE_SIZE ) +return -EINVAL ;memcpy (ie->ie_buffer +le16_to_cpu (ie->ie_length), vs_ie, vs_ie->len +2 );le16_unaligned_add_cpu (&ie->ie_length, vs_ie->len +2 );
drivers/net/wireless/marvell/mwifiex/uap_cmd.c +8 -1
@@ -265,6 +265,8 @@ mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg, rate_ie = (void *)cfg80211_find_ie (WLAN_EID_SUPP_RATES , var_pos, len);if (rate_ie) { +if (rate_ie->len >MWIFIEX_SUPPORTED_RATES ) +return ;memcpy (bss_cfg->rates, rate_ie +1 , rate_ie->len); rate_len = rate_ie->len; }
@@ -272,8 +274,11 @@ mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg, rate_ie = (void *)cfg80211_find_ie (WLAN_EID_EXT_SUPP_RATES , params->beacon.tail, params->beacon.tail_len); -if (rate_ie) +if (rate_ie) { +if (rate_ie->len >MWIFIEX_SUPPORTED_RATES - rate_len) +return ;memcpy (bss_cfg->rates + rate_len, rate_ie +1 , rate_ie->len); + }return ; }
@@ -391,6 +396,8 @@ mwifiex_set_wmm_params(struct mwifiex_private *priv, params->beacon.tail_len);if (vendor_ie) { wmm_ie = vendor_ie; +if (*(wmm_ie +1 ) >sizeof (struct mwifiex_types_wmm_info )) +return ;memcpy (&bss_cfg->wmm_info, wmm_ie +sizeof (struct ieee_types_header ), *(wmm_ie +1 )); priv->wmm_enabled =1 ;
Signature · 1 line
2.17.1
Hi Wen Huang,
Quoted 8 lines
mwifiex_update_vs_ie(),mwifiex_set_uap_rates() and
mwifiex_set_wmm_params()callmemcpy()without checking the destination size.Since the source is given from user-space, this may trigger a heap buffer overflow.Fix them by putting the length check before performing
memcpy().This fix addresses CVE-2019-14814,CVE-2019-14815,CVE-2019-14816.
Thanks for the fix, this change looks good;
Regards,
Ganapathi
First of all, the subject doesn't make a lot of sense?
Secondly, for a fix the code is fine I guess, but:
drivers/net/wireless/marvell/mwifiex/uap_cmd.c mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg, · line 276
Quoted 3 lines
drivers/net/wireless/marvell/mwifiex/uap_cmd.c +0
-0rate_ie = (void *)cfg80211_find_ie (WLAN_EID_EXT_SUPP_RATES , params->beacon.tail, params->beacon.tail_len);
consider removing struct ieee_types_header from your driver, and using struct element from <linux/ieee80211.h> instead.
This also comes with cfg80211_find_elem() that returns a suitably typed pointer, so you don't need any casts.
drivers/net/wireless/marvell/mwifiex/uap_cmd.c mwifiex_set_wmm_params(struct mwifiex_private *priv, · line 400
Quoted 4 lines
drivers/net/wireless/marvell/mwifiex/uap_cmd.c +2
-0if (vendor_ie) { wmm_ie = vendor_ie; +if (*(wmm_ie +1 ) >sizeof (struct mwifiex_types_wmm_info )) +return ;
and using it here would be a whole lot easier to understand too :)
johannes
Quoted 1 line · Johannes Berg
First of all, the subject doesn't make a lot of sense?
Ah, the whole thing is called under that function I guess, never mind
johannes
Quoted 7 lines · [email protected] wrote:
From: Wen Huang <[email protected]>
mwifiex_update_vs_ie(),mwifiex_set_uap_rates() and
mwifiex_set_wmm_params()callmemcpy()without checking the destination size.Since the source is given from user-space, this may trigger a heap buffer overflow.
Quoted 6 lines
Fix them by putting the length check before performing
memcpy().This fix addresses CVE-2019-14814,CVE-2019-14815,CVE-2019-14816.
Signed-off-by Wen Huang <[email protected]>Acked-by Ganapathi Bhat <[email protected]>
Patch applied to wireless-drivers.git, thanks.
7caac62ed598 mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings
Signature · 3 lines
https://patchwork.kernel.org/patch/11117681/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches