Skip to content

Commit 62b635d

Browse files
Dan Carpenterjmberg-intel
authored andcommitted
wifi: cfg80211: sme: cap SSID length in __cfg80211_connect_result()
If the ssid->datalen is more than IEEE80211_MAX_SSID_LEN (32) it would lead to memory corruption so add some bounds checking. Fixes: c38c701 ("wifi: cfg80211: Set SSID if it is not already set") Signed-off-by: Dan Carpenter <[email protected]> Link: https://patch.msgid.link/0aaaae4a3ed37c6252363c34ae4904b1604e8e32.1756456951.git.dan.carpenter@linaro.org Signed-off-by: Johannes Berg <[email protected]>
1 parent c786794 commit 62b635d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

net/wireless/sme.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,13 +900,16 @@ void __cfg80211_connect_result(struct net_device *dev,
900900
if (!wdev->u.client.ssid_len) {
901901
rcu_read_lock();
902902
for_each_valid_link(cr, link) {
903+
u32 ssid_len;
904+
903905
ssid = ieee80211_bss_get_elem(cr->links[link].bss,
904906
WLAN_EID_SSID);
905907

906908
if (!ssid || !ssid->datalen)
907909
continue;
908910

909-
memcpy(wdev->u.client.ssid, ssid->data, ssid->datalen);
911+
ssid_len = min(ssid->datalen, IEEE80211_MAX_SSID_LEN);
912+
memcpy(wdev->u.client.ssid, ssid->data, ssid_len);
910913
wdev->u.client.ssid_len = ssid->datalen;
911914
break;
912915
}

0 commit comments

Comments
 (0)