Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a19f258 authored by Will Deacon's avatar Will Deacon Committed by Greg Kroah-Hartman
Browse files

mac80211: Reject malformed SSID elements 



commit 4152561f5da3fca92af7179dd538ea89e248f9d0 upstream.

Although this shouldn't occur in practice, it's a good idea to bounds
check the length field of the SSID element prior to using it for things
like allocations or memcpy operations.

Cc: <stable@vger.kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Reported-by: default avatarNicolas Waisman <nico@semmle.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20191004095132.15777-1-will@kernel.org


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63eb9c28

net/mac80211/mlme.c

+3 −2
Original line number Diff line number Diff line
@@ -2430,7 +2430,8 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw, 


	rcu_read_lock();

	ssid = ieee80211_bss_get_ie(cbss, WLAN_EID_SSID);

	if (WARN_ON_ONCE(ssid == NULL))

	if (WARN_ONCE(!ssid || ssid[1] > IEEE80211_MAX_SSID_LEN,

		      "invalid SSID element (len=%d)", ssid ? ssid[1] : -1))

		ssid_len = 0;

	else

		ssid_len = ssid[1];
@@ -4756,7 +4757,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 


	rcu_read_lock();

	ssidie = ieee80211_bss_get_ie(req->bss, WLAN_EID_SSID);

	if (!ssidie) {

	if (!ssidie || ssidie[1] > sizeof(assoc_data->ssid)) {

		rcu_read_unlock();

		kfree(assoc_data);

		return -EINVAL;