]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.12-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jan 2025 13:34:18 +0000 (14:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jan 2025 13:34:18 +0000 (14:34 +0100)
added patches:
alsa-hda-realtek-add-support-for-ayaneo-system-using-cs35l41-hda.patch
alsa-hda-realtek-fixup-asus-ga605w.patch
alsa-hda-realtek-fixup-asus-h7606w.patch
zram-fix-potential-uaf-of-zram-table.patch

queue-6.12/alsa-hda-realtek-add-support-for-ayaneo-system-using-cs35l41-hda.patch [new file with mode: 0644]
queue-6.12/alsa-hda-realtek-fixup-asus-ga605w.patch [new file with mode: 0644]
queue-6.12/alsa-hda-realtek-fixup-asus-h7606w.patch [new file with mode: 0644]
queue-6.12/series
queue-6.12/zram-fix-potential-uaf-of-zram-table.patch [new file with mode: 0644]

diff --git a/queue-6.12/alsa-hda-realtek-add-support-for-ayaneo-system-using-cs35l41-hda.patch b/queue-6.12/alsa-hda-realtek-add-support-for-ayaneo-system-using-cs35l41-hda.patch
new file mode 100644 (file)
index 0000000..3c3ceca
--- /dev/null
@@ -0,0 +1,32 @@
+From de5afaddd5a7af6b9c48900741b410ca03e453ae Mon Sep 17 00:00:00 2001
+From: Stefan Binding <sbinding@opensource.cirrus.com>
+Date: Thu, 9 Jan 2025 16:54:48 +0000
+Subject: ALSA: hda/realtek: Add support for Ayaneo System using CS35L41 HDA
+
+From: Stefan Binding <sbinding@opensource.cirrus.com>
+
+commit de5afaddd5a7af6b9c48900741b410ca03e453ae upstream.
+
+Add support for Ayaneo Portable Game System.
+
+System use 2 CS35L41 Amps with HDA, using Internal boost, with I2C
+
+Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/20250109165455.645810-1-sbinding@opensource.cirrus.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
+@@ -10979,6 +10979,7 @@ static const struct hda_quirk alc269_fix
+       SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
++      SND_PCI_QUIRK(0x1f66, 0x0105, "Ayaneo Portable Game Player", ALC287_FIXUP_CS35L41_I2C_2),
+       SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+       SND_PCI_QUIRK(0x2782, 0x0228, "Infinix ZERO BOOK 13", ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13),
+       SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO),
diff --git a/queue-6.12/alsa-hda-realtek-fixup-asus-ga605w.patch b/queue-6.12/alsa-hda-realtek-fixup-asus-ga605w.patch
new file mode 100644 (file)
index 0000000..6d10634
--- /dev/null
@@ -0,0 +1,31 @@
+From f67b1ef261f4370c48e3a7d19907de136be2d5bd Mon Sep 17 00:00:00 2001
+From: "Luke D. Jones" <luke@ljones.dev>
+Date: Sat, 11 Jan 2025 15:27:53 +1300
+Subject: ALSA: hda/realtek: fixup ASUS GA605W
+
+From: Luke D. Jones <luke@ljones.dev>
+
+commit f67b1ef261f4370c48e3a7d19907de136be2d5bd upstream.
+
+The GA605W laptop has almost the exact same codec setup as the GA403
+and so the same quirks apply to it.
+
+Signed-off-by: Luke D. Jones <luke@ljones.dev>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/20250111022754.177551-1-luke@ljones.dev
+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
+@@ -10625,6 +10625,7 @@ static const struct hda_quirk alc269_fix
+       SND_PCI_QUIRK(0x1043, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
+       SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
++      SND_PCI_QUIRK(0x1043, 0x1e83, "ASUS GA605W", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),
+       SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),
+       SND_PCI_QUIRK(0x1043, 0x1eb3, "ASUS Ally RCLA72", ALC287_FIXUP_TAS2781_I2C),
+       SND_PCI_QUIRK(0x1043, 0x1ed3, "ASUS HN7306W", ALC287_FIXUP_CS35L41_I2C_2),
diff --git a/queue-6.12/alsa-hda-realtek-fixup-asus-h7606w.patch b/queue-6.12/alsa-hda-realtek-fixup-asus-h7606w.patch
new file mode 100644 (file)
index 0000000..cf5b6ac
--- /dev/null
@@ -0,0 +1,31 @@
+From 44a48b26639e591e53f6f72000c16576ce107274 Mon Sep 17 00:00:00 2001
+From: "Luke D. Jones" <luke@ljones.dev>
+Date: Sat, 11 Jan 2025 15:27:54 +1300
+Subject: ALSA: hda/realtek: fixup ASUS H7606W
+
+From: Luke D. Jones <luke@ljones.dev>
+
+commit 44a48b26639e591e53f6f72000c16576ce107274 upstream.
+
+The H7606W laptop has almost the exact same codec setup as the GA403
+and so the same quirks apply to it.
+
+Signed-off-by: Luke D. Jones <luke@ljones.dev>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/20250111022754.177551-2-luke@ljones.dev
+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
+@@ -10625,6 +10625,7 @@ static const struct hda_quirk alc269_fix
+       SND_PCI_QUIRK(0x1043, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
+       SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
++      SND_PCI_QUIRK(0x1043, 0x1e63, "ASUS H7606W", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),
+       SND_PCI_QUIRK(0x1043, 0x1e83, "ASUS GA605W", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),
+       SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),
+       SND_PCI_QUIRK(0x1043, 0x1eb3, "ASUS Ally RCLA72", ALC287_FIXUP_TAS2781_I2C),
index 8219e84f0a77632974d82f0f0871c30c65a38a58..23324d0156162a97a1c4e72a7d1e63cce0d3175a 100644 (file)
@@ -72,3 +72,7 @@ nvmet-propagate-npwg-topology.patch
 sched-fair-fix-eevdf-entity-placement-bug-causing-sc.patch
 sched-fair-fix-update_cfs_group-vs-delay_dequeue.patch
 x86-asm-make-serialize-always_inline.patch
+alsa-hda-realtek-add-support-for-ayaneo-system-using-cs35l41-hda.patch
+alsa-hda-realtek-fixup-asus-ga605w.patch
+alsa-hda-realtek-fixup-asus-h7606w.patch
+zram-fix-potential-uaf-of-zram-table.patch
diff --git a/queue-6.12/zram-fix-potential-uaf-of-zram-table.patch b/queue-6.12/zram-fix-potential-uaf-of-zram-table.patch
new file mode 100644 (file)
index 0000000..c327163
--- /dev/null
@@ -0,0 +1,34 @@
+From 212fe1c0df4a150fb6298db2cfff267ceaba5402 Mon Sep 17 00:00:00 2001
+From: Kairui Song <kasong@tencent.com>
+Date: Tue, 7 Jan 2025 14:54:46 +0800
+Subject: zram: fix potential UAF of zram table
+
+From: Kairui Song <kasong@tencent.com>
+
+commit 212fe1c0df4a150fb6298db2cfff267ceaba5402 upstream.
+
+If zram_meta_alloc failed early, it frees allocated zram->table without
+setting it NULL.  Which will potentially cause zram_meta_free to access
+the table if user reset an failed and uninitialized device.
+
+Link: https://lkml.kernel.org/r/20250107065446.86928-1-ryncsn@gmail.com
+Fixes: 74363ec674cb ("zram: fix uninitialized ZRAM not releasing backing device")
+Signed-off-by: Kairui Song <kasong@tencent.com>
+Reviewed-by:  Sergey Senozhatsky <senozhatsky@chromium.org>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/block/zram/zram_drv.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/block/zram/zram_drv.c
++++ b/drivers/block/zram/zram_drv.c
+@@ -1349,6 +1349,7 @@ static bool zram_meta_alloc(struct zram
+       zram->mem_pool = zs_create_pool(zram->disk->disk_name);
+       if (!zram->mem_pool) {
+               vfree(zram->table);
++              zram->table = NULL;
+               return false;
+       }