2019-10-18 10:21:19

by Dan Carpenter

Subject: [PATCH] staging: wilc1000: potential corruption in wilc_parse_join_bss_param()

The "rates_len" value needs to be capped so that the memcpy() doesn't
copy beyond the end of the array.

Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/staging/wilc1000/wilc_hif.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/staging/wilc1000/wilc_hif.c b/drivers/staging/wilc1000/wilc_hif.c
index 0ac2b6ac50b0..e0a95c5cc0d5 100644
--- a/drivers/staging/wilc1000/wilc_hif.c
+++ b/drivers/staging/wilc1000/wilc_hif.c
@@ -479,6 +479,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
rates_ie = cfg80211_find_ie(WLAN_EID_SUPP_RATES, ies->data, ies->len);
if (rates_ie) {
rates_len = rates_ie[1];
+ if (rates_len > WILC_MAX_RATES_SUPPORTED)
+ rates_len = WILC_MAX_RATES_SUPPORTED;
param->supp_rates[0] = rates_len;
memcpy(&param->supp_rates[1], rates_ie + 2, rates_len);
}
--
2.20.1

2019-10-18 21:22:28

by Adham Abozaeid

Subject: Re: [PATCH] staging: wilc1000: potential corruption in wilc_parse_join_bss_param()

On 10/17/19 2:18 AM, Dan Carpenter wrote:
> The "rates_len" value needs to be capped so that the memcpy() doesn't
> copy beyond the end of the array.
>
> Fixes: c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11 driver")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> drivers/staging/wilc1000/wilc_hif.c | 2 ++
> 1 file changed, 2 insertions(+)

Reviewed-by: Adham Abozaeid <[email protected]>

Thanks Dan for the patch.