From: Greg Kroah-Hartman Date: Thu, 11 Aug 2022 13:37:32 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.15.61~230 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8352a74fb2385718bfd013ac67ae29c273bf5fa6;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch --- diff --git a/queue-5.4/alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch b/queue-5.4/alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch new file mode 100644 index 00000000000..f8f12e024b5 --- /dev/null +++ b/queue-5.4/alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch @@ -0,0 +1,43 @@ +From ffb2759df7efbc00187bfd9d1072434a13a54139 Mon Sep 17 00:00:00 2001 +From: Zheyu Ma +Date: Fri, 15 Jul 2022 09:05:15 +0800 +Subject: ALSA: bcd2000: Fix a UAF bug on the error path of probing + +From: Zheyu Ma + +commit ffb2759df7efbc00187bfd9d1072434a13a54139 upstream. + +When the driver fails in snd_card_register() at probe time, it will free +the 'bcd2k->midi_out_urb' before killing it, which may cause a UAF bug. + +The following log can reveal it: + +[ 50.727020] BUG: KASAN: use-after-free in bcd2000_input_complete+0x1f1/0x2e0 [snd_bcd2000] +[ 50.727623] Read of size 8 at addr ffff88810fab0e88 by task swapper/4/0 +[ 50.729530] Call Trace: +[ 50.732899] bcd2000_input_complete+0x1f1/0x2e0 [snd_bcd2000] + +Fix this by adding usb_kill_urb() before usb_free_urb(). + +Fixes: b47a22290d58 ("ALSA: MIDI driver for Behringer BCD2000 USB device") +Signed-off-by: Zheyu Ma +Cc: +Link: https://lore.kernel.org/r/20220715010515.2087925-1-zheyuma97@gmail.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/bcd2000/bcd2000.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/sound/usb/bcd2000/bcd2000.c ++++ b/sound/usb/bcd2000/bcd2000.c +@@ -348,7 +348,8 @@ static int bcd2000_init_midi(struct bcd2 + static void bcd2000_free_usb_related_resources(struct bcd2000 *bcd2k, + struct usb_interface *interface) + { +- /* usb_kill_urb not necessary, urb is aborted automatically */ ++ usb_kill_urb(bcd2k->midi_out_urb); ++ usb_kill_urb(bcd2k->midi_in_urb); + + usb_free_urb(bcd2k->midi_out_urb); + usb_free_urb(bcd2k->midi_in_urb); diff --git a/queue-5.4/series b/queue-5.4/series index 8a1f2bd7b28..e6d012adcd4 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,3 +1,4 @@ makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch scsi-revert-scsi-qla2xxx-fix-disk-failure-to-rediscover.patch +alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch