From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 24 Apr 2020 10:42:35 +0000 (+0300)
Subject: staging: wfx: check ssidlen and prevent an array overflow
X-Git-Tag: v5.10.7~2410^2~220
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87f86cddda65cab8a7e3df8a00e16abeccaa0730;p=platform%2Fkernel%2Flinux-rpi.git

staging: wfx: check ssidlen and prevent an array overflow

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>
Reviewed-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200424104235.GA416402@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 5d5c895..f3e106f 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -351,7 +351,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();