From: Greg Kroah-Hartman Date: Sun, 7 Sep 2025 16:21:28 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v5.4.299~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75cefa4d31c54ba97db5f54f6ff19be4f5776a03;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: riscv-use-lw-when-reading-int-cpu-in-asm_per_cpu.patch --- diff --git a/queue-6.6/riscv-use-lw-when-reading-int-cpu-in-asm_per_cpu.patch b/queue-6.6/riscv-use-lw-when-reading-int-cpu-in-asm_per_cpu.patch new file mode 100644 index 0000000000..e848c3378c --- /dev/null +++ b/queue-6.6/riscv-use-lw-when-reading-int-cpu-in-asm_per_cpu.patch @@ -0,0 +1,38 @@ +From f4ea67a722e8c9e1fb8109adebb9fb881ff0793a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= +Date: Fri, 25 Jul 2025 18:54:10 +0200 +Subject: riscv: use lw when reading int cpu in asm_per_cpu +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Radim Krčmář + +commit f4ea67a722e8c9e1fb8109adebb9fb881ff0793a upstream. + +REG_L is wrong, because thread_info.cpu is 32-bit, not xlen-bit wide. +The struct currently has a hole after cpu, so little endian accesses +seemed fine. + +Fixes: be97d0db5f44 ("riscv: VMAP_STACK overflow detection thread-safe") +Cc: stable@vger.kernel.org +Reviewed-by: Alexandre Ghiti +Signed-off-by: Radim Krčmář +Link: https://lore.kernel.org/r/20250725165410.2896641-5-rkrcmar@ventanamicro.com +Signed-off-by: Paul Walmsley +Signed-off-by: Greg Kroah-Hartman +--- + arch/riscv/include/asm/asm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/riscv/include/asm/asm.h ++++ b/arch/riscv/include/asm/asm.h +@@ -90,7 +90,7 @@ + #endif + + .macro asm_per_cpu dst sym tmp +- REG_L \tmp, TASK_TI_CPU_NUM(tp) ++ lw \tmp, TASK_TI_CPU_NUM(tp) + slli \tmp, \tmp, PER_CPU_OFFSET_SHIFT + la \dst, __per_cpu_offset + add \dst, \dst, \tmp diff --git a/queue-6.6/series b/queue-6.6/series index f8a940436f..de861598f5 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -113,3 +113,4 @@ tools-gpio-rm-.-.cmd-on-make-clean.patch tools-gpio-remove-the-include-directory-on-make-clea.patch slub-reflow-___slab_alloc.patch mm-slub-avoid-wake-up-kswapd-in-set_track_prepare.patch +riscv-use-lw-when-reading-int-cpu-in-asm_per_cpu.patch