arm64: kaslr: fix breakage with CONFIG_MODVERSIONS=y
As it turns out, the KASLR code breaks CONFIG_MODVERSIONS, since the
kcrctab has an absolute address field that is relocated at runtime
when the kernel offset is randomized.
This has been fixed already for PowerPC in the past, so simply wire up
the existing code dealing with this issue.
Cc: <stable@vger.kernel.org>
Fixes: f80fb3a3d5
("arm64: add support for kernel ASLR")
Tested-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
parent
1001354ca3
commit
9c0e83c371
|
@ -17,6 +17,7 @@
|
||||||
#define __ASM_MODULE_H
|
#define __ASM_MODULE_H
|
||||||
|
|
||||||
#include <asm-generic/module.h>
|
#include <asm-generic/module.h>
|
||||||
|
#include <asm/memory.h>
|
||||||
|
|
||||||
#define MODULE_ARCH_VERMAGIC "aarch64"
|
#define MODULE_ARCH_VERMAGIC "aarch64"
|
||||||
|
|
||||||
|
@ -32,6 +33,10 @@ u64 module_emit_plt_entry(struct module *mod, const Elf64_Rela *rela,
|
||||||
Elf64_Sym *sym);
|
Elf64_Sym *sym);
|
||||||
|
|
||||||
#ifdef CONFIG_RANDOMIZE_BASE
|
#ifdef CONFIG_RANDOMIZE_BASE
|
||||||
|
#ifdef CONFIG_MODVERSIONS
|
||||||
|
#define ARCH_RELOCATES_KCRCTAB
|
||||||
|
#define reloc_start (kimage_vaddr - KIMAGE_VADDR)
|
||||||
|
#endif
|
||||||
extern u64 module_alloc_base;
|
extern u64 module_alloc_base;
|
||||||
#else
|
#else
|
||||||
#define module_alloc_base ((u64)_etext - MODULES_VSIZE)
|
#define module_alloc_base ((u64)_etext - MODULES_VSIZE)
|
||||||
|
|
Loading…
Reference in New Issue