Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit badecb001a310408d3473b1fc2ed5aefd0bc92a9

Authored by Antonio Quartulli
Committed by Johannes Berg
1 parent f7fbf70ee9
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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: Antonio Quartulli <ordex@autistici.org>
[rewrapped commit message, small rewording]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -1108,7 +1108,7 @@
1108 1108 sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH;
1109 1109 sdata->u.ibss.ibss_join_req = jiffies;
1110 1110  
1111   - memcpy(sdata->u.ibss.ssid, params->ssid, IEEE80211_MAX_SSID_LEN);
  1111 + memcpy(sdata->u.ibss.ssid, params->ssid, params->ssid_len);
1112 1112 sdata->u.ibss.ssid_len = params->ssid_len;
1113 1113  
1114 1114 mutex_unlock(&sdata->u.ibss.mtx);