hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Eliad Peller <eliad@wizery.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: Alexander Bondar <alexander.bondar@intel.com>
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
David Spinadel 2014-02-11 13:45:41 +02:00 committed by Johannes Berg
parent 802ee9ecfc
commit e4dcbb375c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/mac80211/scan.c
View File

@ -472,9 +472,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
if (local->ops->hw_scan) { if (local->ops->hw_scan) {
u8 *ies; u8 *ies;
local->hw_scan_ies_bufsize = 2 + IEEE80211_MAX_SSID_LEN + local->hw_scan_ies_bufsize = local->scan_ies_len + req->ie_len;
local->scan_ies_len +
req->ie_len;
local->hw_scan_req = kmalloc( local->hw_scan_req = kmalloc(
sizeof(*local->hw_scan_req) + sizeof(*local->hw_scan_req) +
req->n_channels * sizeof(req->channels[0]) + 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; struct cfg80211_chan_def chandef;
int ret, i, iebufsz; int ret, i, iebufsz;
iebufsz = 2 + IEEE80211_MAX_SSID_LEN + iebufsz = local->scan_ies_len + req->ie_len;
local->scan_ies_len + req->ie_len;
lockdep_assert_held(&local->mtx); lockdep_assert_held(&local->mtx);