From: Greg Kroah-Hartman Date: Fri, 25 Jun 2021 10:17:16 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.12.14~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d609dae6b74ba32a0f7ddadb9b7699ad0ddb6545;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: arm64-link-with-z-norelro-for-lld-or-aarch64-elf.patch kbuild-add-config_ld_is_lld.patch --- diff --git a/queue-5.4/arm64-link-with-z-norelro-for-lld-or-aarch64-elf.patch b/queue-5.4/arm64-link-with-z-norelro-for-lld-or-aarch64-elf.patch new file mode 100644 index 00000000000..6e49301ea21 --- /dev/null +++ b/queue-5.4/arm64-link-with-z-norelro-for-lld-or-aarch64-elf.patch @@ -0,0 +1,85 @@ +From foo@baz Fri Jun 25 12:15:34 PM CEST 2021 +From: Jisheng Zhang +Date: Fri, 25 Jun 2021 15:50:12 +0800 +Subject: arm64: link with -z norelro for LLD or aarch64-elf +To: Nick Desaulniers , stable@vger.kernel.org, Greg Kroah-Hartman , Nathan Chancellor , Ard Biesheuvel , Sami Tolvanen , Masahiro Yamada , Sedat Dilek , Thomas Bogendoerfer +Cc: "Catalin Marinas" , "Will Deacon" , "Alan Modra" , "Fāng-ruì Sòng" , "Quentin Perret" , linux-arm-kernel@lists.infradead.org +Message-ID: <20210625155012.4aec8450@xhacker.debian> + +From: Nick Desaulniers + +commit 311bea3cb9ee20ef150ca76fc60a592bf6b159f5 upstream. + +With GNU binutils 2.35+, linking with BFD produces warnings for vmlinux: +aarch64-linux-gnu-ld: warning: -z norelro ignored + +BFD can produce this warning when the target emulation mode does not +support RELRO program headers, and -z relro or -z norelro is passed. + +Alan Modra clarifies: + The default linker emulation for an aarch64-linux ld.bfd is + -maarch64linux, the default for an aarch64-elf linker is + -maarch64elf. They are not equivalent. If you choose -maarch64elf + you get an emulation that doesn't support -z relro. + +The ARCH=arm64 kernel prefers -maarch64elf, but may fall back to +-maarch64linux based on the toolchain configuration. + +LLD will always create RELRO program header regardless of target +emulation. + +To avoid the above warning when linking with BFD, pass -z norelro only +when linking with LLD or with -maarch64linux. + +Fixes: 3b92fa7485eb ("arm64: link with -z norelro regardless of CONFIG_RELOCATABLE") +Fixes: 3bbd3db86470 ("arm64: relocatable: fix inconsistencies in linker script and options") +Cc: # 5.0.x- +Reported-by: kernelci.org bot +Reported-by: Quentin Perret +Signed-off-by: Nick Desaulniers +Reviewed-by: Nathan Chancellor +Acked-by: Ard Biesheuvel +Cc: Alan Modra +Cc: Fāng-ruì Sòng +Link: https://lore.kernel.org/r/20201218002432.788499-1-ndesaulniers@google.com +Signed-off-by: Catalin Marinas +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/Makefile | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/arch/arm64/Makefile ++++ b/arch/arm64/Makefile +@@ -10,7 +10,7 @@ + # + # Copyright (C) 1995-2001 by Russell King + +-LDFLAGS_vmlinux :=--no-undefined -X -z norelro ++LDFLAGS_vmlinux :=--no-undefined -X + CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) + GZFLAGS :=-9 + +@@ -82,17 +82,21 @@ CHECKFLAGS += -D__AARCH64EB__ + AS += -EB + # Prefer the baremetal ELF build target, but not all toolchains include + # it so fall back to the standard linux version if needed. +-KBUILD_LDFLAGS += -EB $(call ld-option, -maarch64elfb, -maarch64linuxb) ++KBUILD_LDFLAGS += -EB $(call ld-option, -maarch64elfb, -maarch64linuxb -z norelro) + UTS_MACHINE := aarch64_be + else + KBUILD_CPPFLAGS += -mlittle-endian + CHECKFLAGS += -D__AARCH64EL__ + AS += -EL + # Same as above, prefer ELF but fall back to linux target if needed. +-KBUILD_LDFLAGS += -EL $(call ld-option, -maarch64elf, -maarch64linux) ++KBUILD_LDFLAGS += -EL $(call ld-option, -maarch64elf, -maarch64linux -z norelro) + UTS_MACHINE := aarch64 + endif + ++ifeq ($(CONFIG_LD_IS_LLD), y) ++KBUILD_LDFLAGS += -z norelro ++endif ++ + CHECKFLAGS += -D__aarch64__ + + ifeq ($(CONFIG_ARM64_MODULE_PLTS),y) diff --git a/queue-5.4/kbuild-add-config_ld_is_lld.patch b/queue-5.4/kbuild-add-config_ld_is_lld.patch new file mode 100644 index 00000000000..8b310a40ccd --- /dev/null +++ b/queue-5.4/kbuild-add-config_ld_is_lld.patch @@ -0,0 +1,41 @@ +From foo@baz Fri Jun 25 12:15:34 PM CEST 2021 +From: Jisheng Zhang +Date: Fri, 25 Jun 2021 15:48:35 +0800 +Subject: kbuild: add CONFIG_LD_IS_LLD +To: Nick Desaulniers , stable@vger.kernel.org, Greg Kroah-Hartman , Nathan Chancellor , Ard Biesheuvel , Sami Tolvanen , Masahiro Yamada , Sedat Dilek , Thomas Bogendoerfer +Cc: "Catalin Marinas" , "Will Deacon" , "Alan Modra" , "Fāng-ruì Sòng" , "Quentin Perret" , linux-arm-kernel@lists.infradead.org +Message-ID: <20210625154836.382536b1@xhacker.debian> + +From: Sami Tolvanen + +commit b744b43f79cc758127042e71f9ad7b1afda30f84 upstream. + +Similarly to the CC_IS_CLANG config, add LD_IS_LLD to avoid GNU ld +specific logic such as ld-version or ld-ifversion and gain the +ability to select potential features that depend on the linker at +configuration time such as LTO. + +Signed-off-by: Sami Tolvanen +Acked-by: Masahiro Yamada +[nc: Reword commit message] +Signed-off-by: Nathan Chancellor +Tested-by: Sedat Dilek +Reviewed-by: Sedat Dilek +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + init/Kconfig | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -20,6 +20,9 @@ config GCC_VERSION + config CC_IS_CLANG + def_bool $(success,$(CC) --version | head -n 1 | grep -q clang) + ++config LD_IS_LLD ++ def_bool $(success,$(LD) -v | head -n 1 | grep -q LLD) ++ + config CLANG_VERSION + int + default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) diff --git a/queue-5.4/series b/queue-5.4/series index ee817c88cbd..8f76d81a7d8 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -5,3 +5,5 @@ drm-nouveau-wait-for-moving-fence-after-pinning-v2.patch drm-radeon-wait-for-moving-fence-after-pinning.patch arm-9081-1-fix-gcc-10-thumb2-kernel-regression.patch mmc-meson-gx-use-memcpy_to-fromio-for-dram-access-quirk.patch +kbuild-add-config_ld_is_lld.patch +arm64-link-with-z-norelro-for-lld-or-aarch64-elf.patch