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 (file)
index 0000000..6e49301
--- /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 <Jisheng.Zhang@synaptics.com>
+Date: Fri, 25 Jun 2021 15:50:12 +0800
+Subject: arm64: link with -z norelro for LLD or aarch64-elf
+To: Nick Desaulniers <ndesaulniers@google.com>, stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Nathan Chancellor <natechancellor@gmail.com>, Ard Biesheuvel <ardb@kernel.org>, Sami Tolvanen <samitolvanen@google.com>, Masahiro Yamada <masahiroy@kernel.org>, Sedat Dilek <sedat.dilek@gmail.com>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Cc: "Catalin Marinas" <catalin.marinas@arm.com>, "Will Deacon" <will@kernel.org>, "Alan Modra" <amodra@gmail.com>, "Fāng-ruì Sòng" <maskray@google.com>, "Quentin Perret" <qperret@google.com>, linux-arm-kernel@lists.infradead.org
+Message-ID: <20210625155012.4aec8450@xhacker.debian>
+
+From: Nick Desaulniers <ndesaulniers@google.com>
+
+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: <stable@vger.kernel.org> # 5.0.x-
+Reported-by: kernelci.org bot <bot@kernelci.org>
+Reported-by: Quentin Perret <qperret@google.com>
+Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
+Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
+Acked-by: Ard Biesheuvel <ardb@kernel.org>
+Cc: Alan Modra <amodra@gmail.com>
+Cc: Fāng-ruì Sòng <maskray@google.com>
+Link: https://lore.kernel.org/r/20201218002432.788499-1-ndesaulniers@google.com
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 (file)
index 0000000..8b310a4
--- /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 <Jisheng.Zhang@synaptics.com>
+Date: Fri, 25 Jun 2021 15:48:35 +0800
+Subject: kbuild: add CONFIG_LD_IS_LLD
+To: Nick Desaulniers <ndesaulniers@google.com>, stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Nathan Chancellor <natechancellor@gmail.com>, Ard Biesheuvel <ardb@kernel.org>, Sami Tolvanen <samitolvanen@google.com>, Masahiro Yamada <masahiroy@kernel.org>, Sedat Dilek <sedat.dilek@gmail.com>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Cc: "Catalin Marinas" <catalin.marinas@arm.com>, "Will Deacon" <will@kernel.org>, "Alan Modra" <amodra@gmail.com>, "Fāng-ruì Sòng" <maskray@google.com>, "Quentin Perret" <qperret@google.com>, linux-arm-kernel@lists.infradead.org
+Message-ID: <20210625154836.382536b1@xhacker.debian>
+
+From: Sami Tolvanen <samitolvanen@google.com>
+
+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 <samitolvanen@google.com>
+Acked-by: Masahiro Yamada <masahiroy@kernel.org>
+[nc: Reword commit message]
+Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
+Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
+Reviewed-by: Sedat Dilek <sedat.dilek@gmail.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 ee817c88cbdc3739d703997bc7d83828adad1332..8f76d81a7d8de58d0a9893012cba9910bf511e98 100644 (file)
--- 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