From: Greg Kroah-Hartman Date: Tue, 8 Nov 2022 12:41:13 +0000 (+0100) Subject: 6.0-stable patches X-Git-Tag: v4.9.333~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83e02cf0d173b42975bcb5f1afb659243387778c;p=thirdparty%2Fkernel%2Fstable-queue.git 6.0-stable patches added patches: wifi-brcmfmac-fix-potential-buffer-overflow-in-brcmf_fweh_event_worker.patch --- diff --git a/queue-6.0/series b/queue-6.0/series index 25c3b60e715..2926b87e963 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -196,3 +196,4 @@ drm-amd-display-update-latencies-on-dcn321.patch drm-amd-display-update-dsc-capabilitie-for-dcn314.patch drm-i915-sdvo-filter-out-invalid-outputs-more-sensibly.patch drm-i915-sdvo-setup-ddc-fully-before-output-init.patch +wifi-brcmfmac-fix-potential-buffer-overflow-in-brcmf_fweh_event_worker.patch diff --git a/queue-6.0/wifi-brcmfmac-fix-potential-buffer-overflow-in-brcmf_fweh_event_worker.patch b/queue-6.0/wifi-brcmfmac-fix-potential-buffer-overflow-in-brcmf_fweh_event_worker.patch new file mode 100644 index 00000000000..94034674ed4 --- /dev/null +++ b/queue-6.0/wifi-brcmfmac-fix-potential-buffer-overflow-in-brcmf_fweh_event_worker.patch @@ -0,0 +1,123 @@ +From 6788ba8aed4e28e90f72d68a9d794e34eac17295 Mon Sep 17 00:00:00 2001 +From: Dokyung Song +Date: Fri, 21 Oct 2022 15:13:59 +0900 +Subject: wifi: brcmfmac: Fix potential buffer overflow in brcmf_fweh_event_worker() + +From: Dokyung Song + +commit 6788ba8aed4e28e90f72d68a9d794e34eac17295 upstream. + +This patch fixes an intra-object buffer overflow in brcmfmac that occurs +when the device provides a 'bsscfgidx' equal to or greater than the +buffer size. The patch adds a check that leads to a safe failure if that +is the case. + +This fixes CVE-2022-3628. + +UBSAN: array-index-out-of-bounds in drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +index 52 is out of range for type 'brcmf_if *[16]' +CPU: 0 PID: 1898 Comm: kworker/0:2 Tainted: G O 5.14.0+ #132 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 +Workqueue: events brcmf_fweh_event_worker +Call Trace: + dump_stack_lvl+0x57/0x7d + ubsan_epilogue+0x5/0x40 + __ubsan_handle_out_of_bounds+0x69/0x80 + ? memcpy+0x39/0x60 + brcmf_fweh_event_worker+0xae1/0xc00 + ? brcmf_fweh_call_event_handler.isra.0+0x100/0x100 + ? rcu_read_lock_sched_held+0xa1/0xd0 + ? rcu_read_lock_bh_held+0xb0/0xb0 + ? lockdep_hardirqs_on_prepare+0x273/0x3e0 + process_one_work+0x873/0x13e0 + ? lock_release+0x640/0x640 + ? pwq_dec_nr_in_flight+0x320/0x320 + ? rwlock_bug.part.0+0x90/0x90 + worker_thread+0x8b/0xd10 + ? __kthread_parkme+0xd9/0x1d0 + ? process_one_work+0x13e0/0x13e0 + kthread+0x379/0x450 + ? _raw_spin_unlock_irq+0x24/0x30 + ? set_kthread_struct+0x100/0x100 + ret_from_fork+0x1f/0x30 +================================================================================ +general protection fault, probably for non-canonical address 0xe5601c0020023fff: 0000 [#1] SMP KASAN +KASAN: maybe wild-memory-access in range [0x2b0100010011fff8-0x2b0100010011ffff] +CPU: 0 PID: 1898 Comm: kworker/0:2 Tainted: G O 5.14.0+ #132 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 +Workqueue: events brcmf_fweh_event_worker +RIP: 0010:brcmf_fweh_call_event_handler.isra.0+0x42/0x100 +Code: 89 f5 53 48 89 fb 48 83 ec 08 e8 79 0b 38 fe 48 85 ed 74 7e e8 6f 0b 38 fe 48 89 ea 48 b8 00 00 00 00 00 fc ff df 48 c1 ea 03 <80> 3c 02 00 0f 85 8b 00 00 00 4c 8b 7d 00 44 89 e0 48 ba 00 00 00 +RSP: 0018:ffffc9000259fbd8 EFLAGS: 00010207 +RAX: dffffc0000000000 RBX: ffff888115d8cd50 RCX: 0000000000000000 +RDX: 0560200020023fff RSI: ffffffff8304bc91 RDI: ffff888115d8cd50 +RBP: 2b0100010011ffff R08: ffff888112340050 R09: ffffed1023549809 +R10: ffff88811aa4c047 R11: ffffed1023549808 R12: 0000000000000045 +R13: ffffc9000259fca0 R14: ffff888112340050 R15: ffff888112340000 +FS: 0000000000000000(0000) GS:ffff88811aa00000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 000000004053ccc0 CR3: 0000000112740000 CR4: 0000000000750ef0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +PKRU: 55555554 +Call Trace: + brcmf_fweh_event_worker+0x117/0xc00 + ? brcmf_fweh_call_event_handler.isra.0+0x100/0x100 + ? rcu_read_lock_sched_held+0xa1/0xd0 + ? rcu_read_lock_bh_held+0xb0/0xb0 + ? lockdep_hardirqs_on_prepare+0x273/0x3e0 + process_one_work+0x873/0x13e0 + ? lock_release+0x640/0x640 + ? pwq_dec_nr_in_flight+0x320/0x320 + ? rwlock_bug.part.0+0x90/0x90 + worker_thread+0x8b/0xd10 + ? __kthread_parkme+0xd9/0x1d0 + ? process_one_work+0x13e0/0x13e0 + kthread+0x379/0x450 + ? _raw_spin_unlock_irq+0x24/0x30 + ? set_kthread_struct+0x100/0x100 + ret_from_fork+0x1f/0x30 +Modules linked in: 88XXau(O) 88x2bu(O) +---[ end trace 41d302138f3ff55a ]--- +RIP: 0010:brcmf_fweh_call_event_handler.isra.0+0x42/0x100 +Code: 89 f5 53 48 89 fb 48 83 ec 08 e8 79 0b 38 fe 48 85 ed 74 7e e8 6f 0b 38 fe 48 89 ea 48 b8 00 00 00 00 00 fc ff df 48 c1 ea 03 <80> 3c 02 00 0f 85 8b 00 00 00 4c 8b 7d 00 44 89 e0 48 ba 00 00 00 +RSP: 0018:ffffc9000259fbd8 EFLAGS: 00010207 +RAX: dffffc0000000000 RBX: ffff888115d8cd50 RCX: 0000000000000000 +RDX: 0560200020023fff RSI: ffffffff8304bc91 RDI: ffff888115d8cd50 +RBP: 2b0100010011ffff R08: ffff888112340050 R09: ffffed1023549809 +R10: ffff88811aa4c047 R11: ffffed1023549808 R12: 0000000000000045 +R13: ffffc9000259fca0 R14: ffff888112340050 R15: ffff888112340000 +FS: 0000000000000000(0000) GS:ffff88811aa00000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 000000004053ccc0 CR3: 0000000112740000 CR4: 0000000000750ef0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +PKRU: 55555554 +Kernel panic - not syncing: Fatal exception + +Reported-by: Dokyung Song +Reported-by: Jisoo Jang +Reported-by: Minsuk Kang +Reviewed-by: Arend van Spriel +Cc: +Signed-off-by: Dokyung Song +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20221021061359.GA550858@laguna +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +@@ -228,6 +228,10 @@ static void brcmf_fweh_event_worker(stru + brcmf_fweh_event_name(event->code), event->code, + event->emsg.ifidx, event->emsg.bsscfgidx, + event->emsg.addr); ++ if (event->emsg.bsscfgidx >= BRCMF_MAX_IFS) { ++ bphy_err(drvr, "invalid bsscfg index: %u\n", event->emsg.bsscfgidx); ++ goto event_free; ++ } + + /* convert event message */ + emsg_be = &event->emsg;