From: Greg Kroah-Hartman Date: Mon, 30 Dec 2024 14:59:02 +0000 (+0100) Subject: 6.6-stable patches X-Git-Tag: v6.1.123~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9c8f3ea1c8c613754a6fcb2155a64a817ef81d8;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: alsa-hda-realtek-fix-spelling-mistake-firelfy-firefly.patch alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch block-avoid-to-reuse-hctx-not-removed-from-cpuhp-callback-list.patch x86-cpu-intel-drop-stray-fam6-check-with-new-intel-cpu-model-defines.patch --- diff --git a/queue-6.6/alsa-hda-realtek-fix-spelling-mistake-firelfy-firefly.patch b/queue-6.6/alsa-hda-realtek-fix-spelling-mistake-firelfy-firefly.patch new file mode 100644 index 00000000000..d61d0b72ebc --- /dev/null +++ b/queue-6.6/alsa-hda-realtek-fix-spelling-mistake-firelfy-firefly.patch @@ -0,0 +1,32 @@ +From 20c3b3e5f2641eff3d85f33e6a468ac052b169bd Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Thu, 5 Dec 2024 10:28:33 +0000 +Subject: ALSA: hda/realtek: Fix spelling mistake "Firelfy" -> "Firefly" + +From: Colin Ian King + +commit 20c3b3e5f2641eff3d85f33e6a468ac052b169bd upstream. + +There is a spelling mistake in a literal string in the alc269_fixup_tbl +quirk table. Fix it. + +Fixes: 0d08f0eec961 ("ALSA: hda/realtek: fix micmute LEDs don't work on HP Laptops") +Signed-off-by: Colin Ian King +Link: https://patch.msgid.link/20241205102833.476190-1-colin.i.king@gmail.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -10059,7 +10059,7 @@ static const struct hda_quirk alc269_fix + SND_PCI_QUIRK(0x103c, 0x8d91, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8d92, "HP ZBook Firefly 16 G12", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8e18, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED), +- SND_PCI_QUIRK(0x103c, 0x8e19, "HP ZBook Firelfy 14 G12A", ALC285_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x8e19, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8e1a, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), diff --git a/queue-6.6/alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch b/queue-6.6/alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch new file mode 100644 index 00000000000..00f30c26c2f --- /dev/null +++ b/queue-6.6/alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch @@ -0,0 +1,34 @@ +From 66a0a2b0473c39ae85c44628d14e4366fdc0aa0d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 20 Dec 2024 12:44:16 +0100 +Subject: ALSA: sh: Fix wrong argument order for copy_from_iter() + +From: Takashi Iwai + +commit 66a0a2b0473c39ae85c44628d14e4366fdc0aa0d upstream. + +Fix a brown paper bag bug I introduced at converting to the standard +iter helper; the arguments were wrongly passed and have to be +swapped. + +Fixes: 9b5f8ee43e48 ("ALSA: sh: Use standard helper for buffer accesses") +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202412140019.jat5Dofr-lkp@intel.com/ +Link: https://patch.msgid.link/20241220114417.5898-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/sh/sh_dac_audio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/sh/sh_dac_audio.c ++++ b/sound/sh/sh_dac_audio.c +@@ -163,7 +163,7 @@ static int snd_sh_dac_pcm_copy(struct sn + /* channel is not used (interleaved data) */ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + +- if (copy_from_iter(chip->data_buffer + pos, src, count) != count) ++ if (copy_from_iter(chip->data_buffer + pos, count, src) != count) + return -EFAULT; + chip->buffer_end = chip->data_buffer + pos + count; + diff --git a/queue-6.6/block-avoid-to-reuse-hctx-not-removed-from-cpuhp-callback-list.patch b/queue-6.6/block-avoid-to-reuse-hctx-not-removed-from-cpuhp-callback-list.patch new file mode 100644 index 00000000000..96e47499e33 --- /dev/null +++ b/queue-6.6/block-avoid-to-reuse-hctx-not-removed-from-cpuhp-callback-list.patch @@ -0,0 +1,51 @@ +From 85672ca9ceeaa1dcf2777a7048af5f4aee3fd02b Mon Sep 17 00:00:00 2001 +From: Ming Lei +Date: Wed, 18 Dec 2024 18:16:15 +0800 +Subject: block: avoid to reuse `hctx` not removed from cpuhp callback list + +From: Ming Lei + +commit 85672ca9ceeaa1dcf2777a7048af5f4aee3fd02b upstream. + +If the 'hctx' isn't removed from cpuhp callback list, we can't reuse it, +otherwise use-after-free may be triggered. + +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-lkp/202412172217.b906db7c-lkp@intel.com +Tested-by: kernel test robot +Fixes: 22465bbac53c ("blk-mq: move cpuhp callback registering out of q->sysfs_lock") +Signed-off-by: Ming Lei +Link: https://lore.kernel.org/r/20241218101617.3275704-3-ming.lei@redhat.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + block/blk-mq.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- a/block/blk-mq.c ++++ b/block/blk-mq.c +@@ -4278,6 +4278,15 @@ struct gendisk *blk_mq_alloc_disk_for_qu + } + EXPORT_SYMBOL(blk_mq_alloc_disk_for_queue); + ++/* ++ * Only hctx removed from cpuhp list can be reused ++ */ ++static bool blk_mq_hctx_is_reusable(struct blk_mq_hw_ctx *hctx) ++{ ++ return hlist_unhashed(&hctx->cpuhp_online) && ++ hlist_unhashed(&hctx->cpuhp_dead); ++} ++ + static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx( + struct blk_mq_tag_set *set, struct request_queue *q, + int hctx_idx, int node) +@@ -4287,7 +4296,7 @@ static struct blk_mq_hw_ctx *blk_mq_allo + /* reuse dead hctx first */ + spin_lock(&q->unused_hctx_lock); + list_for_each_entry(tmp, &q->unused_hctx_list, hctx_list) { +- if (tmp->numa_node == node) { ++ if (tmp->numa_node == node && blk_mq_hctx_is_reusable(tmp)) { + hctx = tmp; + break; + } diff --git a/queue-6.6/series b/queue-6.6/series index 01723ee98a9..15703aa58ff 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -80,3 +80,7 @@ i2c-microchip-core-fix-ghost-detections.patch power-supply-gpio-charger-fix-set-charge-current-limits.patch btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch btrfs-sysfs-fix-direct-super-block-member-reads.patch +alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch +x86-cpu-intel-drop-stray-fam6-check-with-new-intel-cpu-model-defines.patch +alsa-hda-realtek-fix-spelling-mistake-firelfy-firefly.patch +block-avoid-to-reuse-hctx-not-removed-from-cpuhp-callback-list.patch diff --git a/queue-6.6/x86-cpu-intel-drop-stray-fam6-check-with-new-intel-cpu-model-defines.patch b/queue-6.6/x86-cpu-intel-drop-stray-fam6-check-with-new-intel-cpu-model-defines.patch new file mode 100644 index 00000000000..31b68de7697 --- /dev/null +++ b/queue-6.6/x86-cpu-intel-drop-stray-fam6-check-with-new-intel-cpu-model-defines.patch @@ -0,0 +1,48 @@ +From 34b3fc558b537bdf99644dcde539e151716f6331 Mon Sep 17 00:00:00 2001 +From: Andrew Cooper +Date: Wed, 29 May 2024 19:36:05 +0100 +Subject: x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines + +From: Andrew Cooper + +commit 34b3fc558b537bdf99644dcde539e151716f6331 upstream. + +The outer if () should have been dropped when switching to c->x86_vfm. + +Fixes: 6568fc18c2f6 ("x86/cpu/intel: Switch to new Intel CPU model defines") +Signed-off-by: Andrew Cooper +Signed-off-by: Borislav Petkov (AMD) +Acked-by: Tony Luck +Link: https://lore.kernel.org/r/20240529183605.17520-1-andrew.cooper3@citrix.com +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kernel/cpu/intel.c | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +--- a/arch/x86/kernel/cpu/intel.c ++++ b/arch/x86/kernel/cpu/intel.c +@@ -341,17 +341,13 @@ static void early_init_intel(struct cpui + } + + /* Penwell and Cloverview have the TSC which doesn't sleep on S3 */ +- if (c->x86 == 6) { +- switch (c->x86_vfm) { +- case INTEL_ATOM_SALTWELL_MID: +- case INTEL_ATOM_SALTWELL_TABLET: +- case INTEL_ATOM_SILVERMONT_MID: +- case INTEL_ATOM_AIRMONT_NP: +- set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3); +- break; +- default: +- break; +- } ++ switch (c->x86_vfm) { ++ case INTEL_ATOM_SALTWELL_MID: ++ case INTEL_ATOM_SALTWELL_TABLET: ++ case INTEL_ATOM_SILVERMONT_MID: ++ case INTEL_ATOM_AIRMONT_NP: ++ set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3); ++ break; + } + + /*