From f2f17486c8f5607763f2af56ad29d222ada66fe8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 11 Aug 2022 15:37:21 +0200 Subject: [PATCH] 4.19-stable patches added patches: alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch --- ...uaf-bug-on-the-error-path-of-probing.patch | 43 +++++++++++++++++++ queue-4.19/series | 1 + ...h-z-noexecstack-no-warn-rwx-segments.patch | 12 +++--- 3 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 queue-4.19/alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch diff --git a/queue-4.19/alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch b/queue-4.19/alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch new file mode 100644 index 00000000000..f294bbf4966 --- /dev/null +++ b/queue-4.19/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 +@@ -357,7 +357,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-4.19/series b/queue-4.19/series index 2f510f3243e..b78d3f3d6d8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -1,2 +1,3 @@ makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch +alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch diff --git a/queue-4.19/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch b/queue-4.19/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch index ea8e71118f8..47aa9cb5cf1 100644 --- a/queue-4.19/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch +++ b/queue-4.19/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch @@ -73,12 +73,12 @@ Signed-off-by: Greg Kroah-Hartman hostprogs-y := mkpiggy --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile -@@ -178,7 +178,7 @@ quiet_cmd_vdso = VDSO $@ - sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' +@@ -172,7 +172,7 @@ quiet_cmd_vdso = VDSO $@ - VDSO_LDFLAGS = -shared --hash-style=both --build-id \ -- $(call ld-option, --eh-frame-hdr) -Bsymbolic -+ $(call ld-option, --eh-frame-hdr) -Bsymbolic -z noexecstack + VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ + $(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \ +- -Bsymbolic ++ -Bsymbolic -z noexecstack GCOV_PROFILE := n - quiet_cmd_vdso_and_check = VDSO $@ + # -- 2.47.3