From: Greg Kroah-Hartman Date: Mon, 20 Jan 2025 13:34:18 +0000 (+0100) Subject: 6.12-stable patches X-Git-Tag: v6.6.73~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ec13a1cd4fe1e5cf7ab18fb17e0ef6417ae0b51;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches 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 --- 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 index 0000000000..3c3ceca7a5 --- /dev/null +++ b/queue-6.12/alsa-hda-realtek-add-support-for-ayaneo-system-using-cs35l41-hda.patch @@ -0,0 +1,32 @@ +From de5afaddd5a7af6b9c48900741b410ca03e453ae Mon Sep 17 00:00:00 2001 +From: Stefan Binding +Date: Thu, 9 Jan 2025 16:54:48 +0000 +Subject: ALSA: hda/realtek: Add support for Ayaneo System using CS35L41 HDA + +From: Stefan Binding + +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 +Cc: +Link: https://patch.msgid.link/20250109165455.645810-1-sbinding@opensource.cirrus.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 +@@ -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 index 0000000000..6d1063471b --- /dev/null +++ b/queue-6.12/alsa-hda-realtek-fixup-asus-ga605w.patch @@ -0,0 +1,31 @@ +From f67b1ef261f4370c48e3a7d19907de136be2d5bd Mon Sep 17 00:00:00 2001 +From: "Luke D. Jones" +Date: Sat, 11 Jan 2025 15:27:53 +1300 +Subject: ALSA: hda/realtek: fixup ASUS GA605W + +From: Luke D. Jones + +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 +Cc: +Link: https://patch.msgid.link/20250111022754.177551-1-luke@ljones.dev +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 +@@ -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 index 0000000000..cf5b6acd32 --- /dev/null +++ b/queue-6.12/alsa-hda-realtek-fixup-asus-h7606w.patch @@ -0,0 +1,31 @@ +From 44a48b26639e591e53f6f72000c16576ce107274 Mon Sep 17 00:00:00 2001 +From: "Luke D. Jones" +Date: Sat, 11 Jan 2025 15:27:54 +1300 +Subject: ALSA: hda/realtek: fixup ASUS H7606W + +From: Luke D. Jones + +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 +Cc: +Link: https://patch.msgid.link/20250111022754.177551-2-luke@ljones.dev +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 +@@ -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), diff --git a/queue-6.12/series b/queue-6.12/series index 8219e84f0a..23324d0156 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -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 index 0000000000..c327163a40 --- /dev/null +++ b/queue-6.12/zram-fix-potential-uaf-of-zram-table.patch @@ -0,0 +1,34 @@ +From 212fe1c0df4a150fb6298db2cfff267ceaba5402 Mon Sep 17 00:00:00 2001 +From: Kairui Song +Date: Tue, 7 Jan 2025 14:54:46 +0800 +Subject: zram: fix potential UAF of zram table + +From: Kairui Song + +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 +Reviewed-by: Sergey Senozhatsky +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + 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; + } +