Commit c4616f6b authored Oct 19, 2020 by Nick Desaulniers

FROMLIST: arm64: link with -z norelro regardless of CONFIG_RELOCATABLE



With CONFIG_EXPERT=y, CONFIG_KASAN=y, CONFIG_RANDOMIZE_BASE=n,
CONFIG_RELOCATABLE=n, we observe the following failure when trying to
link the kernel image with LD=ld.lld:

error: section: .exit.data is not contiguous with other relro sections

ld.lld defaults to -z relro while ld.bfd defaults to -z norelro. This
was previously fixed, but only for CONFIG_RELOCATABLE=y.

Cc: stable@vger.kernel.org
Fixes: commit 3bbd3db86470 ("arm64: relocatable: fix inconsistencies in linker script and options")
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>

Bug: 170775238
Link: https://lore.kernel.org/lkml/20201016175339.2429280-1-ndesaulniers@google.com/T/


Change-Id: I6a084b9610dec6c23c6bdd6e0eaeecc2d27f5dca
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>

parent 90355457

arch/arm64/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		#
		# Copyright (C) 1995-2001 by Russell King

		LDFLAGS_vmlinux :=--no-undefined -X
		LDFLAGS_vmlinux :=--no-undefined -X -z norelro
		CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
		GZFLAGS :=-9

		@@ -18,7 +18,7 @@ ifeq ($(CONFIG_RELOCATABLE), y)
		# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour
		# for relative relocs, since this leads to better Image compression
		# with the relocation offsets always being zero.
		LDFLAGS_vmlinux += -shared -Bsymbolic -z notext -z norelro \
		LDFLAGS_vmlinux += -shared -Bsymbolic -z notext \
		$(call ld-option, --no-apply-dynamic-relocs)
		endif