Skip to content

Commit 2bb5370

Browse files
PlaidCat0xC0ncord
andcommitted
wifi: mac80211: Avoid address calculations via out of bounds array indexing
jira LE-1907 cve CVE-2024-41071 Rebuild_History Non-Buildable kernel-5.14.0-427.37.1.el9_4 commit-author Kenton Groombridge <concord@gentoo.org> commit 2663d04 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 <keescook@chromium.org> Signed-off-by: Kees Cook <kees@kernel.org> Signed-off-by: Kenton Groombridge <concord@gentoo.org> Link: https://msgid.link/20240605152218.236061-1-concord@gentoo.org Signed-off-by: Johannes Berg <johannes.berg@intel.com> (cherry picked from commit 2663d04) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent d5fa1fe commit 2bb5370

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
@@ -323,7 +323,8 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
323323
struct cfg80211_scan_request *req;
324324
struct cfg80211_chan_def chandef;
325325
u8 bands_used = 0;
326-
int i, ielen, n_chans;
326+
int i, ielen;
327+
u32 *n_chans;
327328
u32 flags = 0;
328329

329330
req = rcu_dereference_protected(local->scan_req,
@@ -333,34 +334,34 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
333334
return false;
334335

335336
if (ieee80211_hw_check(&local->hw, SINGLE_SCAN_ON_ALL_BANDS)) {
337+
local->hw_scan_req->req.n_channels = req->n_channels;
338+
336339
for (i = 0; i < req->n_channels; i++) {
337340
local->hw_scan_req->req.channels[i] = req->channels[i];
338341
bands_used |= BIT(req->channels[i]->band);
339342
}
340-
341-
n_chans = req->n_channels;
342343
} else {
343344
do {
344345
if (local->hw_scan_band == NUM_NL80211_BANDS)
345346
return false;
346347

347-
n_chans = 0;
348+
n_chans = &local->hw_scan_req->req.n_channels;
349+
*n_chans = 0;
348350

349351
for (i = 0; i < req->n_channels; i++) {
350352
if (req->channels[i]->band !=
351353
local->hw_scan_band)
352354
continue;
353-
local->hw_scan_req->req.channels[n_chans] =
355+
local->hw_scan_req->req.channels[(*n_chans)++] =
354356
req->channels[i];
355-
n_chans++;
357+
356358
bands_used |= BIT(req->channels[i]->band);
357359
}
358360

359361
local->hw_scan_band++;
360-
} while (!n_chans);
362+
} while (!*n_chans);
361363
}
362364

363-
local->hw_scan_req->req.n_channels = n_chans;
364365
ieee80211_prepare_scan_chandef(&chandef);
365366

366367
if (req->flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT)

0 commit comments

Comments
 (0)