]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
staging: wfx: check ssidlen and prevent an array overflow
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 24 Apr 2020 10:42:35 +0000 (13:42 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:48:18 +0000 (17:48 +0200)
[ Upstream commit 87f86cddda65cab8a7e3df8a00e16abeccaa0730 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/wfx/sta.c

index 9d430346a58bb32e1f10e4b960a0cffe11d933ad..969d7a4a7fbd9d0e56787bd0af6e855f90f470ac 100644 (file)
@@ -520,7 +520,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();