* [PATCH] staging: wfx: check ssidlen and prevent an array overflow
@ 2020-04-24 10:42 Dan Carpenter
2020-04-24 11:39 ` Jerome Pouiller
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2020-04-24 10:42 UTC (permalink / raw)
To: Jérôme Pouiller
Cc: Greg Kroah-Hartman, devel, linux-kernel, kernel-janitors
We need to cap "ssidlen" to prevent a memcpy() overflow.
Fixes: 40115bbc40e2 ("staging: wfx: implement the rest of mac80211 API")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/staging/wfx/sta.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index c73dbb3a0de8c..3bff0f1e3d9ba 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -479,7 +479,9 @@ static void wfx_do_join(struct wfx_vif *wvif)
ssidie = ieee80211_bss_get_ie(bss, WLAN_EID_SSID);
if (ssidie) {
ssidlen = ssidie[1];
- memcpy(ssid, &ssidie[2], ssidie[1]);
+ if (ssidlen > IEEE80211_MAX_SSID_LEN)
+ ssidlen = IEEE80211_MAX_SSID_LEN;
+ memcpy(ssid, &ssidie[2], ssidlen);
}
rcu_read_unlock();
--
2.26.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] staging: wfx: check ssidlen and prevent an array overflow
2020-04-24 10:42 [PATCH] staging: wfx: check ssidlen and prevent an array overflow Dan Carpenter
@ 2020-04-24 11:39 ` Jerome Pouiller
0 siblings, 0 replies; 2+ messages in thread
From: Jerome Pouiller @ 2020-04-24 11:39 UTC (permalink / raw)
To: Dan Carpenter
Cc: Greg Kroah-Hartman, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
On Friday 24 April 2020 12:42:35 CEST Dan Carpenter wrote:
>
> We need to cap "ssidlen" to prevent a memcpy() overflow.
>
> Fixes: 40115bbc40e2 ("staging: wfx: implement the rest of mac80211 API")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/staging/wfx/sta.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
> index c73dbb3a0de8c..3bff0f1e3d9ba 100644
> --- a/drivers/staging/wfx/sta.c
> +++ b/drivers/staging/wfx/sta.c
> @@ -479,7 +479,9 @@ static void wfx_do_join(struct wfx_vif *wvif)
> ssidie = ieee80211_bss_get_ie(bss, WLAN_EID_SSID);
> if (ssidie) {
> ssidlen = ssidie[1];
> - memcpy(ssid, &ssidie[2], ssidie[1]);
> + if (ssidlen > IEEE80211_MAX_SSID_LEN)
> + ssidlen = IEEE80211_MAX_SSID_LEN;
I'd have a little preference for sizeof(ssid) instead of
IEEE80211_MAX_SSID_LEN, but ok.
> + memcpy(ssid, &ssidie[2], ssidlen);
> }
> rcu_read_unlock();
>
> --
> 2.26.1
>
Reviewed-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
--
Jérôme Pouiller
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-24 11:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-24 10:42 [PATCH] staging: wfx: check ssidlen and prevent an array overflow Dan Carpenter
2020-04-24 11:39 ` Jerome Pouiller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox