]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
riscv/kexec_file: Handle R_RISCV_64 in purgatory relocator
authorYao Zi <ziyao@disroot.org>
Wed, 26 Mar 2025 05:14:46 +0000 (05:14 +0000)
committerAlexandre Ghiti <alexghiti@rivosinc.com>
Tue, 1 Apr 2025 07:07:12 +0000 (07:07 +0000)
Commit 58ff537109ac ("riscv: Omit optimized string routines when
using KASAN") introduced calls to EXPORT_SYMBOL() in assembly string
routines, which result in R_RISCV_64 relocations against
.export_symbol section. As these rountines are reused by RISC-V
purgatory and our relocator doesn't recognize these relocations, this
fails kexec-file-load with dmesg like

[   11.344251] kexec_image: Unknown rela relocation: 2
[   11.345972] kexec_image: Error loading purgatory ret=-8

Let's support R_RISCV_64 relocation to fix kexec on 64-bit RISC-V.
32-bit variant isn't covered since KEXEC_FILE and KEXEC_PURGATORY isn't
available.

Fixes: 58ff537109ac ("riscv: Omit optimized string routines when using KASAN")
Signed-off-by: Yao Zi <ziyao@disroot.org>
Tested-by: Björn Töpel <bjorn@rivosinc.com>
Reviewed-by: Björn Töpel <bjorn@rivosinc.com>
Link: https://lore.kernel.org/r/20250326051445.55131-2-ziyao@disroot.org
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
arch/riscv/kernel/elf_kexec.c

index 3c37661801f95d19cf39945466265beddd538438..e783a72d051f438494962ffb89891b0e06ba5aec 100644 (file)
@@ -468,6 +468,9 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
                case R_RISCV_ALIGN:
                case R_RISCV_RELAX:
                        break;
+               case R_RISCV_64:
+                       *(u64 *)loc = val;
+                       break;
                default:
                        pr_err("Unknown rela relocation: %d\n", r_type);
                        return -ENOEXEC;