]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 7 Sep 2025 16:21:28 +0000 (18:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 7 Sep 2025 16:21:28 +0000 (18:21 +0200)
added patches:
riscv-use-lw-when-reading-int-cpu-in-asm_per_cpu.patch

queue-6.6/riscv-use-lw-when-reading-int-cpu-in-asm_per_cpu.patch [new file with mode: 0644]
queue-6.6/series

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 (file)
index 0000000..e848c33
--- /dev/null
@@ -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?= <rkrcmar@ventanamicro.com>
+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ář <rkrcmar@ventanamicro.com>
+
+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 <alexghiti@rivosinc.com>
+Signed-off-by: Radim Krčmář <rkrcmar@ventanamicro.com>
+Link: https://lore.kernel.org/r/20250725165410.2896641-5-rkrcmar@ventanamicro.com
+Signed-off-by: Paul Walmsley <pjw@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
index f8a940436f2232bbc3eaab8e38f7d6da2e8d86db..de861598f5a59b5d8ced0a5db29b36425fad22bf 100644 (file)
@@ -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