From: Daniel Maslowski cyrevolt@googlemail.com
mainline inclusion from mainline-v6.11-rc2 commit fb197c5d2fd24b9af3d4697d0cf778645846d6d5 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IALCQL CVE: CVE-2024-43868
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
When alignment handling is delegated to the kernel, everything must be word-aligned in purgatory, since the trap handler is then set to the kexec one. Without the alignment, hitting the exception would ultimately crash. On other occasions, the kernel's handler would take care of exceptions. This has been tested on a JH7110 SoC with oreboot and its SBI delegating unaligned access exceptions and the kernel configured to handle them.
Fixes: 736e30af583fb ("RISC-V: Add purgatory") Signed-off-by: Daniel Maslowski cyrevolt@gmail.com Reviewed-by: Alexandre Ghiti alexghiti@rivosinc.com Link: https://lore.kernel.org/r/20240719170437.247457-1-cyrevolt@gmail.com Signed-off-by: Palmer Dabbelt palmer@rivosinc.com Signed-off-by: Yuntao Liu liuyuntao12@huawei.com --- arch/riscv/purgatory/entry.S | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/riscv/purgatory/entry.S b/arch/riscv/purgatory/entry.S index 5bcf3af903da..0e6ca6d5ae4b 100644 --- a/arch/riscv/purgatory/entry.S +++ b/arch/riscv/purgatory/entry.S @@ -7,6 +7,7 @@ * Author: Li Zhengyu (lizhengyu3@huawei.com) * */ +#include <asm/asm.h> #include <linux/linkage.h>
.text @@ -34,6 +35,7 @@ SYM_CODE_END(purgatory_start)
.data
+.align LGREG SYM_DATA(riscv_kernel_entry, .quad 0)
.end