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

Commit e4dcbb37 authored by David Spinadel's avatar David Spinadel Committed by Johannes Berg
Browse files

mac80211: fix IE buffer len 



Remove size of SSID IE from the IE buffer in scan and
sched scan, since this IE isn't added to this buffer.

Reviewed-by: default avatarEliad Peller <eliad@wizery.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: default avatarAlexander Bondar <alexander.bondar@intel.com>
Signed-off-by: default avatarDavid Spinadel <david.spinadel@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 802ee9ec

net/mac80211/scan.c

+2 −5
Original line number Diff line number Diff line
@@ -472,9 +472,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata, 
	if (local->ops->hw_scan) {

		u8 *ies;



		local->hw_scan_ies_bufsize = 2 + IEEE80211_MAX_SSID_LEN +

					     local->scan_ies_len +

					     req->ie_len;

		local->hw_scan_ies_bufsize = local->scan_ies_len + req->ie_len;

		local->hw_scan_req = kmalloc(

				sizeof(*local->hw_scan_req) +

				req->n_channels * sizeof(req->channels[0]) +
@@ -979,8 +977,7 @@ int __ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata, 
	struct cfg80211_chan_def chandef;

	int ret, i, iebufsz;



	iebufsz = 2 + IEEE80211_MAX_SSID_LEN +

		  local->scan_ies_len + req->ie_len;

	iebufsz = local->scan_ies_len + req->ie_len;



	lockdep_assert_held(&local->mtx);