6.1-stable patches

added patches:
	alsa-hda-realtek-add-quirk-for-framework-f111-000c.patch
	alsa-seq-oss-fix-races-at-processing-sysex-messages.patch

diff --git a/queue-6.1/alsa-hda-realtek-add-quirk-for-framework-f111-000c.patch b/queue-6.1/alsa-hda-realtek-add-quirk-for-framework-f111-000c.patch
new file mode 100644 (file)
index 0000000..d405c83
--- /dev/null
+++ b/queue-6.1/alsa-hda-realtek-add-quirk-for-framework-f111-000c.patch
@@ -0,0 +1,40 @@
+From 7b509910b3ad6d7aacead24c8744de10daf8715d Mon Sep 17 00:00:00 2001
+From: Daniel Schaefer <dhs@frame.work>
+Date: Tue, 31 Dec 2024 12:59:58 +0800
+Subject: ALSA hda/realtek: Add quirk for Framework F111:000C
+
+From: Daniel Schaefer <dhs@frame.work>
+
+commit 7b509910b3ad6d7aacead24c8744de10daf8715d upstream.
+
+Similar to commit eb91c456f371
+("ALSA: hda/realtek: Add Framework Laptop 13 (Intel Core Ultra) to quirks")
+and previous quirks for Framework systems with
+Realtek codecs.
+
+000C is a new platform that will also have an ALC285 codec and needs the
+same quirk.
+
+Cc: Jaroslav Kysela <perex@perex.cz>
+Cc: Takashi Iwai <tiwai@suse.com>
+Cc: linux@frame.work
+Cc: Dustin L. Howett <dustin@howett.net>
+Signed-off-by: Daniel Schaefer <dhs@frame.work>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/20241231045958.14545-1-dhs@frame.work
+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
+@@ -10255,6 +10255,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0xf111, 0x0001, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0xf111, 0x0006, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0xf111, 0x0009, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
++      SND_PCI_QUIRK(0xf111, 0x000c, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
+ 
+ #if 0
+       /* Below is a quirk table taken from the old code.

diff --git a/queue-6.1/alsa-seq-oss-fix-races-at-processing-sysex-messages.patch b/queue-6.1/alsa-seq-oss-fix-races-at-processing-sysex-messages.patch
new file mode 100644 (file)
index 0000000..d7ae382
--- /dev/null
+++ b/queue-6.1/alsa-seq-oss-fix-races-at-processing-sysex-messages.patch
@@ -0,0 +1,45 @@
+From 0179488ca992d79908b8e26b9213f1554fc5bacc Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 30 Dec 2024 12:05:35 +0100
+Subject: ALSA: seq: oss: Fix races at processing SysEx messages
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 0179488ca992d79908b8e26b9213f1554fc5bacc upstream.
+
+OSS sequencer handles the SysEx messages split in 6 bytes packets, and
+ALSA sequencer OSS layer tries to combine those.  It stores the data
+in the internal buffer and this access is racy as of now, which may
+lead to the out-of-bounds access.
+
+As a temporary band-aid fix, introduce a mutex for serializing the
+process of the SysEx message packets.
+
+Reported-by: Kun Hu <huk23@m.fudan.edu.cn>
+Closes: https://lore.kernel.org/2B7E93E4-B13A-4AE4-8E87-306A8EE9BBB7@m.fudan.edu.cn
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/20241230110543.32454-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/core/seq/oss/seq_oss_synth.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/core/seq/oss/seq_oss_synth.c
++++ b/sound/core/seq/oss/seq_oss_synth.c
+@@ -66,6 +66,7 @@ static struct seq_oss_synth midi_synth_d
+ };
+ 
+ static DEFINE_SPINLOCK(register_lock);
++static DEFINE_MUTEX(sysex_mutex);
+ 
+ /*
+  * prototypes
+@@ -497,6 +498,7 @@ snd_seq_oss_synth_sysex(struct seq_oss_d
+       if (!info)
+               return -ENXIO;
+ 
++      guard(mutex)(&sysex_mutex);
+       sysex = info->sysex;
+       if (sysex == NULL) {
+               sysex = kzalloc(sizeof(*sysex), GFP_KERNEL);

diff --git a/queue-6.1/series b/queue-6.1/series
index 21cf272f41cdfd96cfe8ceb6b3754ddda0c0fde8..f003423b01acdc9297637458fd7261bba4013d60 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -65,3 +65,5 @@ arc-build-try-to-guess-gcc-variant-of-cross-compiler.patch
 usb-xhci-avoid-queuing-redundant-stop-endpoint-comma.patch
 modpost-fix-input-module_device_table-built-for-64-b.patch
 modpost-fix-the-missed-iteration-for-the-max-bit-in-.patch
+alsa-hda-realtek-add-quirk-for-framework-f111-000c.patch
+alsa-seq-oss-fix-races-at-processing-sysex-messages.patch