From: Greg Kroah-Hartman Date: Thu, 11 Aug 2022 13:37:41 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.15.61~229 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dac617647a77603689ffe49d414a8e5fb2febdd3;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch alsa-hda-realtek-add-quirk-for-clevo-nv45pz.patch alsa-hda-realtek-add-quirk-for-hp-spectre-x360-15-eb0xxx.patch --- diff --git a/queue-5.10/alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch b/queue-5.10/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.10/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.10/alsa-hda-realtek-add-quirk-for-clevo-nv45pz.patch b/queue-5.10/alsa-hda-realtek-add-quirk-for-clevo-nv45pz.patch new file mode 100644 index 00000000000..09583bc8081 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-add-quirk-for-clevo-nv45pz.patch @@ -0,0 +1,30 @@ +From be561ffad708f0cee18aee4231f80ffafaf7a419 Mon Sep 17 00:00:00 2001 +From: Tim Crawford +Date: Sat, 30 Jul 2022 21:22:43 -0600 +Subject: ALSA: hda/realtek: Add quirk for Clevo NV45PZ + +From: Tim Crawford + +commit be561ffad708f0cee18aee4231f80ffafaf7a419 upstream. + +Fixes headset detection on Clevo NV45PZ. + +Signed-off-by: Tim Crawford +Cc: +Link: https://lore.kernel.org/r/20220731032243.4300-1-tcrawford@system76.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -8921,6 +8921,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), ++ SND_PCI_QUIRK(0x1558, 0x4041, "Clevo NV4[15]PZ", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x40a1, "Clevo NL40GU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x40c1, "Clevo NL40[CZ]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x40d1, "Clevo NL41DU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), diff --git a/queue-5.10/alsa-hda-realtek-add-quirk-for-hp-spectre-x360-15-eb0xxx.patch b/queue-5.10/alsa-hda-realtek-add-quirk-for-hp-spectre-x360-15-eb0xxx.patch new file mode 100644 index 00000000000..5c6af9bbd9d --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-add-quirk-for-hp-spectre-x360-15-eb0xxx.patch @@ -0,0 +1,33 @@ +From 24df5428ef9d1ca1edd54eca7eb667110f2dfae3 Mon Sep 17 00:00:00 2001 +From: Ivan Hasenkampf +Date: Wed, 3 Aug 2022 18:40:01 +0200 +Subject: ALSA: hda/realtek: Add quirk for HP Spectre x360 15-eb0xxx + +From: Ivan Hasenkampf + +commit 24df5428ef9d1ca1edd54eca7eb667110f2dfae3 upstream. + +Fixes speaker output on HP Spectre x360 15-eb0xxx + +[ re-sorted in SSID order by tiwai ] + +Signed-off-by: Ivan Hasenkampf +Cc: +Link: https://lore.kernel.org/r/20220803164001.290394-1-ivan.hasenkampf@gmail.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -8790,6 +8790,8 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x861f, "HP Elite Dragonfly G1", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED), + SND_PCI_QUIRK(0x103c, 0x86c7, "HP Envy AiO 32", ALC274_FIXUP_HP_ENVY_GPIO), ++ SND_PCI_QUIRK(0x103c, 0x86e7, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1), ++ SND_PCI_QUIRK(0x103c, 0x86e8, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1), + SND_PCI_QUIRK(0x103c, 0x8716, "HP Elite Dragonfly G2 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8720, "HP EliteBook x360 1040 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8724, "HP EliteBook 850 G7", ALC285_FIXUP_HP_GPIO_LED), diff --git a/queue-5.10/series b/queue-5.10/series index 745fdc5d873..49602482bb0 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -2,3 +2,6 @@ makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch revert-pnfs-nfs3_set_ds_client-should-set-nfs_cs_noping.patch scsi-revert-scsi-qla2xxx-fix-disk-failure-to-rediscover.patch +alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch +alsa-hda-realtek-add-quirk-for-clevo-nv45pz.patch +alsa-hda-realtek-add-quirk-for-hp-spectre-x360-15-eb0xxx.patch