Commit-ID: 7c21383f3429dd70da39c0c7f1efa12377a47ab6 Gitweb: https://git.kernel.org/tip/7c21383f3429dd70da39c0c7f1efa12377a47ab6 Author: Kees Cook <keescook@xxxxxxxxxxxx> AuthorDate: Thu, 4 Apr 2019 14:40:27 -0700 Committer: Borislav Petkov <bp@xxxxxxx> CommitDate: Fri, 5 Apr 2019 12:34:35 +0200 x86/build: Keep local relocations with ld.lld The LLVM linker (ld.lld) defaults to removing local relocations, which causes KASLR boot failures. ld.bfd and ld.gold already handle this correctly. This adds the explicit instruction "--discard-none" during the link phase. There is no change in output for ld.bfd and ld.gold, but ld.lld now produces an image with all the needed relocations. Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: clang-built-linux@xxxxxxxxxxxxxxxx Cc: x86-ml <x86@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20190404214027.GA7324@beast Link: https://github.com/ClangBuiltLinux/linux/issues/404 --- arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index a587805c6687..56e748a7679f 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -47,7 +47,7 @@ export REALMODE_CFLAGS export BITS ifdef CONFIG_X86_NEED_RELOCS - LDFLAGS_vmlinux := --emit-relocs + LDFLAGS_vmlinux := --emit-relocs --discard-none endif #
|