Skip to content

Commit baf603e

Browse files
PlaidCat0xC0ncord
andcommitted
wifi: mac80211: Avoid address calculations via out of bounds array indexing
jira VULN-6985 cve CVE-2024-41071 commit-author Kenton Groombridge <[email protected]> commit 2663d04 upstream-diff There is some difference since this kernel still has `scan_width` support, which is removed in this commit: wifi: cfg80211: remove scan_width support 5add321 req->n_channels must be set before req->channels[] can be used. This patch fixes one of the issues encountered in [1]. [ 83.964255] UBSAN: array-index-out-of-bounds in net/mac80211/scan.c:364:4 [ 83.964258] index 0 is out of range for type 'struct ieee80211_channel *[]' [...] [ 83.964264] Call Trace: [ 83.964267] <TASK> [ 83.964269] dump_stack_lvl+0x3f/0xc0 [ 83.964274] __ubsan_handle_out_of_bounds+0xec/0x110 [ 83.964278] ieee80211_prep_hw_scan+0x2db/0x4b0 [ 83.964281] __ieee80211_start_scan+0x601/0x990 [ 83.964291] nl80211_trigger_scan+0x874/0x980 [ 83.964295] genl_family_rcv_msg_doit+0xe8/0x160 [ 83.964298] genl_rcv_msg+0x240/0x270 [...] [1] https://bugzilla.kernel.org/show_bug.cgi?id=218810 Co-authored-by: Kees Cook <[email protected]> Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Kenton Groombridge <[email protected]> Link: https://msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]> (cherry picked from commit 2663d04) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 82aca3b commit baf603e

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

net/mac80211/scan.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
312312
struct cfg80211_scan_request *req;
313313
struct cfg80211_chan_def chandef;
314314
u8 bands_used = 0;
315-
int i, ielen, n_chans;
315+
int i, ielen;
316+
u32 *n_chans;
316317
u32 flags = 0;
317318

318319
req = rcu_dereference_protected(local->scan_req,
@@ -322,34 +323,34 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
322323
return false;
323324

324325
if (ieee80211_hw_check(&local->hw, SINGLE_SCAN_ON_ALL_BANDS)) {
326+
local->hw_scan_req->req.n_channels = req->n_channels;
327+
325328
for (i = 0; i < req->n_channels; i++) {
326329
local->hw_scan_req->req.channels[i] = req->channels[i];
327330
bands_used |= BIT(req->channels[i]->band);
328331
}
329-
330-
n_chans = req->n_channels;
331332
} else {
332333
do {
333334
if (local->hw_scan_band == NUM_NL80211_BANDS)
334335
return false;
335336

336-
n_chans = 0;
337+
n_chans = &local->hw_scan_req->req.n_channels;
338+
*n_chans = 0;
337339

338340
for (i = 0; i < req->n_channels; i++) {
339341
if (req->channels[i]->band !=
340342
local->hw_scan_band)
341343
continue;
342-
local->hw_scan_req->req.channels[n_chans] =
344+
local->hw_scan_req->req.channels[(*n_chans)++] =
343345
req->channels[i];
344-
n_chans++;
346+
345347
bands_used |= BIT(req->channels[i]->band);
346348
}
347349

348350
local->hw_scan_band++;
349-
} while (!n_chans);
351+
} while (!*n_chans);
350352
}
351353

352-
local->hw_scan_req->req.n_channels = n_chans;
353354
ieee80211_prepare_scan_chandef(&chandef, req->scan_width);
354355

355356
if (req->flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT)

0 commit comments

Comments
 (0)