5.10-stable patches

added patches:
	alsa-hda-realtek-add-quirk-for-clevo-np70pnp.patch
	alsa-usb-audio-clear-midi-port-active-flag-after-draining.patch

diff --git a/queue-5.10/alsa-hda-realtek-add-quirk-for-clevo-np70pnp.patch b/queue-5.10/alsa-hda-realtek-add-quirk-for-clevo-np70pnp.patch
new file mode 100644 (file)
index 0000000..2dc2e20
--- /dev/null
+++ b/queue-5.10/alsa-hda-realtek-add-quirk-for-clevo-np70pnp.patch
@@ -0,0 +1,30 @@
+From 86222af07abf1f5f07a5873cc399c29ab8a9b8b8 Mon Sep 17 00:00:00 2001
+From: Tim Crawford <tcrawford@system76.com>
+Date: Thu, 21 Apr 2022 11:04:12 -0600
+Subject: ALSA: hda/realtek: Add quirk for Clevo NP70PNP
+
+From: Tim Crawford <tcrawford@system76.com>
+
+commit 86222af07abf1f5f07a5873cc399c29ab8a9b8b8 upstream.
+
+Fixes headset detection on Clevo NP70PNP.
+
+Signed-off-by: Tim Crawford <tcrawford@system76.com>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20220421170412.3697-1-tcrawford@system76.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -8897,6 +8897,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x1558, 0x8562, "Clevo NH[5|7][0-9]RZ[Q]", ALC269_FIXUP_DMIC),
+       SND_PCI_QUIRK(0x1558, 0x8668, "Clevo NP50B[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1558, 0x866d, "Clevo NP5[05]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
++      SND_PCI_QUIRK(0x1558, 0x867c, "Clevo NP7[01]PNP", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1558, 0x867d, "Clevo NP7[01]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1558, 0x8680, "Clevo NJ50LU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1558, 0x8686, "Clevo NH50[CZ]U", ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME),

diff --git a/queue-5.10/alsa-usb-audio-clear-midi-port-active-flag-after-draining.patch b/queue-5.10/alsa-usb-audio-clear-midi-port-active-flag-after-draining.patch
new file mode 100644 (file)
index 0000000..9fe5ece
--- /dev/null
+++ b/queue-5.10/alsa-usb-audio-clear-midi-port-active-flag-after-draining.patch
@@ -0,0 +1,41 @@
+From 0665886ad1392e6b5bae85d7a6ccbed48dca1522 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 20 Apr 2022 15:02:47 +0200
+Subject: ALSA: usb-audio: Clear MIDI port active flag after draining
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 0665886ad1392e6b5bae85d7a6ccbed48dca1522 upstream.
+
+When a rawmidi output stream is closed, it calls the drain at first,
+then does trigger-off only when the drain returns -ERESTARTSYS as a
+fallback.  It implies that each driver should turn off the stream
+properly after the drain.  Meanwhile, USB-audio MIDI interface didn't
+change the port->active flag after the drain.  This may leave the
+output work picking up the port that is closed right now, which
+eventually leads to a use-after-free for the already released rawmidi
+object.
+
+This patch fixes the bug by properly clearing the port->active flag
+after the output drain.
+
+Reported-by: syzbot+70e777a39907d6d5fd0a@syzkaller.appspotmail.com
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/00000000000011555605dceaff03@google.com
+Link: https://lore.kernel.org/r/20220420130247.22062-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/midi.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/usb/midi.c
++++ b/sound/usb/midi.c
+@@ -1210,6 +1210,7 @@ static void snd_usbmidi_output_drain(str
+               } while (drain_urbs && timeout);
+               finish_wait(&ep->drain_wait, &wait);
+       }
++      port->active = 0;
+       spin_unlock_irq(&ep->buffer_lock);
+ }
+ 

diff --git a/queue-5.10/series b/queue-5.10/series
index d7ffbe01ec19dd40bd3216cd96069533071a0b4c..359fa6c8f9c8d2f267144064aea846048a3105d1 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -4,3 +4,5 @@ tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch
 perf-tools-fix-segfault-accessing-sample_id-xyarray.patch
 gfs2-assign-rgrp-glock-before-compute_bitstructs.patch
 net-sched-cls_u32-fix-netns-refcount-changes-in-u32_change.patch
+alsa-usb-audio-clear-midi-port-active-flag-after-draining.patch
+alsa-hda-realtek-add-quirk-for-clevo-np70pnp.patch