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

Commit badecb00 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Johannes Berg
Browse files

mac80211: fix SSID copy on IBSS JOIN 



The 'ssid' field of the cfg80211_ibss_params is a u8 pointer and
its length is likely to be less than IEEE80211_MAX_SSID_LEN most
of the time.

This patch fixes the ssid copy in ieee80211_ibss_join() by using
the SSID length to prevent it from reading beyond the string.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
[rewrapped commit message, small rewording]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f7fbf70e

net/mac80211/ibss.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, 
	sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH;

	sdata->u.ibss.ibss_join_req = jiffies;



	memcpy(sdata->u.ibss.ssid, params->ssid, IEEE80211_MAX_SSID_LEN);

	memcpy(sdata->u.ibss.ssid, params->ssid, params->ssid_len);

	sdata->u.ibss.ssid_len = params->ssid_len;



	mutex_unlock(&sdata->u.ibss.mtx);