LoongArch: Move KASLR to EFI stub to avoid initrd overlap
cover LoongArch: Move KASLR to EFI stub to avoid initrd overlap
This series addresses a potential overlap issue between the kernel image and the initrd when KASLR is enabled.
In the normal boot flow, the bootloader is responsible for loading both vmlinux and the initrd, and it can guarantee that the two do not overlap in memory. However, this assumption only holds as long as neither image changes its location afterwards.
The in-kernel KASLR implementation breaks that assumption. When the initrd is placed close to the kernel image, randomizing the kernel location at runtime may move it into the initrd region, leading to memory corruption early during boot.
To fix this, this series moves the KASLR logic out of the kernel proper and into the EFI stub. With this change, the final placement of both the kernel image and the initrd is determined by the EFI memory allocator. This ensures that the two allocations are coordinated and cannot overlap.
Functionally, the kernel still supports KASLR as before, but the randomization now happens before the kernel is entered, rather than during early kernel relocation.
WANG Rui (3):
LoongArch: Allow rdtime_h and rdtime_l in 64-bit builds efi/loongarch: Randomize kernel preferred address for KASLR
LoongArch: Remove KASLR handling from relocate_kernel()
arch/loongarch/include/asm/efi.h | 4 +- arch/loongarch/include/asm/loongarch.h | 6 - arch/loongarch/include/asm/setup.h | 2 +- arch/loongarch/kernel/head.S | 12 -- arch/loongarch/kernel/relocate.c | 182 +---------------------- drivers/firmware/efi/libstub/loongarch.c | 15 ++ 6 files changed, 24 insertions(+), 197 deletions(-)
Signature · 1 line
2.54.0
RFC PATCH 1/3 LoongArch: Allow rdtime_h and rdtime_l in 64-bit builds
Remove the CONFIG_32BIT guard around rdtime_h() and rdtime_l() so they can also be used in 64-bit builds.
--- arch/loongarch/include/asm/loongarch.h | 6 ------ 1 file changed, 6 deletions(-)
arch/loongarch/include/asm/loongarch.h +0 -6
@@ -1248,8 +1248,6 @@#ifndef __ASSEMBLER__ -#ifdef CONFIG_32BIT - static __always_inline u32 rdtime_h(void) {u32 val =0 ;
@@ -1274,8 +1272,6 @@ static __always_inline u32 rdtime_l(void)return val; } -#else - static __always_inline u64 rdtime_d(void) {u64 val =0 ;
@@ -1288,8 +1284,6 @@ static __always_inline u64 rdtime_d(void)return val; } -#endif -static inline unsigned int get_csr_cpuid (void ) {return csr_read32 (LOONGARCH_CSR_CPUID );
Signature · 1 line
2.54.0
RFC PATCH 2/3 efi/loongarch: Randomize kernel preferred address for KASLR
In reply to WANG RuiIntroduce efi_get_kimg_kaslr_address() to compute the preferred kernel image address dynamically when CONFIG_RANDOMIZE_BASE is enabled. The function derives a random offset using EFI-provided randomness combined with the timer value, and constrains it within CONFIG_RANDOMIZE_BASE_MAX_OFFSET.
Update EFI_KIMG_PREFERRED_ADDRESS to call this helper so that the EFI stub can select a randomized load address when KASLR is active, while preserving the original base address behavior when KASLR is disabled or nokaslr is specified.
--- arch/loongarch/include/asm/efi.h | 4 +++- drivers/firmware/efi/libstub/loongarch.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)
arch/loongarch/include/asm/efi.h +3 -1
@@ -30,6 +30,8 @@ static inline unsigned long efi_get_kimg_min_align(void) return SZ_2M; } -#define EFI_KIMG_PREFERRED_ADDRESS PHYSADDR(VMLINUX_LOAD_ADDRESS) +unsigned long efi_get_kimg_kaslr_address (void ); + +#define EFI_KIMG_PREFERRED_ADDRESS efi_get_kimg_kaslr_address()#endif /* _ASM_LOONGARCH_EFI_H */
drivers/firmware/efi/libstub/loongarch.c +15 -0
@@ -38,6 +38,21 @@ static efi_status_t exit_boot_func(struct efi_boot_memmap *map, void *priv)return EFI_SUCCESS ; } +unsigned long efi_get_kimg_kaslr_address (void ) +{ +unsigned int random_offset =0 ; + +#ifdef CONFIG_RANDOMIZE_BASE +if (!efi_nokaslr) { +efi_get_random_bytes (sizeof (random_offset), (u8 *)&random_offset); + random_offset ^= (rdtime_l () <<16 ); + random_offset &= (CONFIG_RANDOMIZE_BASE_MAX_OFFSET -1 ); + } +#endif + +return PHYSADDR (VMLINUX_LOAD_ADDRESS ) + random_offset; +} +unsigned long __weak kernel_entry_address (unsigned long kernel_addr,efi_loaded_image_t *image) {
Signature · 1 line
2.54.0
Re: [RFC PATCH 2/3] efi/loongarch: Randomize kernel preferred address for KASLR
Hi Rui
Quoted 6 lines
drivers/firmware/efi/libstub/loongarch.c +0
-0@@ -38,6 +38,21 @@ static efi_status_t exit_boot_func(struct efi_boot_memmap *map, void *priv)return EFI_SUCCESS ;
drivers/firmware/efi/libstub/loongarch.c static efi_status_t exit_boot_func(struct efi_boot_memmap *map, void *priv) · line 48
Quoted 10 lines
drivers/firmware/efi/libstub/loongarch.c +8
-0} +unsigned long efi_get_kimg_kaslr_address (void ) +{ +unsigned int random_offset =0 ; + +#ifdef CONFIG_RANDOMIZE_BASE +if (!efi_nokaslr) { +efi_get_random_bytes (sizeof (random_offset), (u8 *)&random_offset); + random_offset ^= (rdtime_l () <<16 );
random_offset &= ~(efi_get_kimg_min_align() - 1);
drivers/firmware/efi/libstub/loongarch.c static efi_status_t exit_boot_func(struct efi_boot_memmap *map, void *priv) · line 58
Quoted 10 lines
drivers/firmware/efi/libstub/loongarch.c +7
-0+ random_offset &= (CONFIG_RANDOMIZE_BASE_MAX_OFFSET - 1); + } +#endif + +return PHYSADDR (VMLINUX_LOAD_ADDRESS ) + random_offset; +} +unsigned long __weak kernel_entry_address (unsigned long kernel_addr,efi_loaded_image_t *image) {
--
Lisa
Re: [RFC PATCH 2/3] efi/loongarch: Randomize kernel preferred address for KASLR
Hi Lisa,
Quoted 11 lines · Lisa Robinson
Hi Rui
Quoted 8 lines
drivers/firmware/efi/libstub/loongarch.c +0
-0@@ -38,6 +38,21 @@ static efi_status_t exit_boot_func(struct efi_boot_memmap *map, void *priv)return EFI_SUCCESS ; }
Quoted 10 lines
drivers/firmware/efi/libstub/loongarch.c static efi_status_t exit_boot_func(struct efi_boot_memmap *map, void *priv) · line 48
Quoted 8 lines
drivers/firmware/efi/libstub/loongarch.c +8
-0+unsigned long efi_get_kimg_kaslr_address (void ) +{ +unsigned int random_offset =0 ; + +#ifdef CONFIG_RANDOMIZE_BASE +if (!efi_nokaslr) { +efi_get_random_bytes (sizeof (random_offset), (u8 *)&random_offset); + random_offset ^= (rdtime_l () <<16 );
random_offset&= ~(efi_get_kimg_min_align() - 1);
Thanks for pointing that out.
Aligning to 64K here seems preferable. Otherwise, it reduces the entropy.
Thanks,
Rui
Quoted 14 lines
drivers/firmware/efi/libstub/loongarch.c static efi_status_t exit_boot_func(struct efi_boot_memmap *map, void *priv) · line 58
Quoted 11 lines
drivers/firmware/efi/libstub/loongarch.c +7
-0+ random_offset &= (CONFIG_RANDOMIZE_BASE_MAX_OFFSET - 1); + } +#endif + +return PHYSADDR (VMLINUX_LOAD_ADDRESS ) + random_offset; +} +unsigned long __weak kernel_entry_address (unsigned long kernel_addr,efi_loaded_image_t *image) {--
Lisa
RFC PATCH 3/3 LoongArch: Remove KASLR handling from relocate_kernel
In reply to WANG RuiWith KASLR address selection handled earlier in the boot flow, the in-kernel relocation logic is no longer needed.
Remove the code that determines a randomized relocation address and copies the kernel image at runtime. relocate_kernel() is simplified to apply relocation fixups only, and its return type is updated to void since no offset is returned anymore.
--- arch/loongarch/include/asm/setup.h | 2 +- arch/loongarch/kernel/head.S | 12 -- arch/loongarch/kernel/relocate.c | 182 +---------------------------- 3 files changed, 6 insertions(+), 190 deletions(-)
arch/loongarch/include/asm/setup.h +1 -1
@@ -42,7 +42,7 @@ extern long __relr_dyn_begin;extern long __relr_dyn_end;#endif -extern unsigned long __init relocate_kernel (void ); +extern void __init relocate_kernel (void );#endif
arch/loongarch/kernel/head.S +0 -12
@@ -84,18 +84,6 @@ SYM_CODE_START(kernel_entry) # kernel entry point bl relocate_kernel -#ifdef CONFIG_RANDOMIZE_BASE - /* Repoint the sp into the new kernel */ - PTR_LI sp, (_THREAD_SIZE - PT_SIZE) - PTR_ADD sp, sp, tp - set_saved_sp sp, t0, t1 - - /* Jump to the new kernel: new_pc = current_pc + random_offset */ - pcaddi t0, 0 - PTR_ADD t0, t0, a0 - jirl zero, t0, 0xc -#endif /* CONFIG_RANDOMIZE_BASE */ - #endif /* CONFIG_RELOCATABLE */ #ifdef CONFIG_KASAN
arch/loongarch/kernel/relocate.c +5 -177
215 lines not on this page · raw message
Signature · 1 line
2.54.0