From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 11 Apr 2022 15:19:28 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v4.9.310~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c212333ac0ee6d19e85d9bc50f8501835d4dfead;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	arm64-module-remove-noload-from-linker-script.patch
---

diff --git a/queue-5.10/arm64-module-remove-noload-from-linker-script.patch b/queue-5.10/arm64-module-remove-noload-from-linker-script.patch
new file mode 100644
index 00000000000..e27f0449ed9
--- /dev/null
+++ b/queue-5.10/arm64-module-remove-noload-from-linker-script.patch
@@ -0,0 +1,50 @@
+From foo@baz Mon Apr 11 05:16:34 PM CEST 2022
+From: Fangrui Song <maskray@google.com>
+Date: Fri, 18 Feb 2022 00:12:09 -0800
+Subject: arm64: module: remove (NOLOAD) from linker script
+
+From: Fangrui Song <maskray@google.com>
+
+commit 4013e26670c590944abdab56c4fa797527b74325 upstream.
+
+On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually
+inappropriate for .plt and .text.* sections which are always
+SHT_PROGBITS.
+
+In GNU ld, if PLT entries are needed, .plt will be SHT_PROGBITS anyway
+and (NOLOAD) will be essentially ignored. In ld.lld, since
+https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to
+customize the output section type"), ld.lld will report a `section type
+mismatch` error. Just remove (NOLOAD) to fix the error.
+
+[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The
+section should be marked as not loadable" on
+https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is
+outdated for ELF.
+
+Tested-by: Nathan Chancellor <nathan@kernel.org>
+Reported-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Fangrui Song <maskray@google.com>
+Acked-by: Ard Biesheuvel <ardb@kernel.org>
+Link: https://lore.kernel.org/r/20220218081209.354383-1-maskray@google.com
+Signed-off-by: Will Deacon <will@kernel.org>
+[nathan: Fix conflicts due to lack of 1cbdf60bd1b7]
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/include/asm/module.lds.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm64/include/asm/module.lds.h
++++ b/arch/arm64/include/asm/module.lds.h
+@@ -1,7 +1,7 @@
+ #ifdef CONFIG_ARM64_MODULE_PLTS
+ SECTIONS {
+-	.plt 0 (NOLOAD) : { BYTE(0) }
+-	.init.plt 0 (NOLOAD) : { BYTE(0) }
+-	.text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) }
++	.plt 0 : { BYTE(0) }
++	.init.plt 0 : { BYTE(0) }
++	.text.ftrace_trampoline 0 : { BYTE(0) }
+ }
+ #endif
diff --git a/queue-5.10/series b/queue-5.10/series
index e90872aa9d1..5b8858d52e1 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -164,3 +164,4 @@ selftests-cgroup-fix-build-on-older-distros.patch
 selftests-cgroup-make-cg_create-use-0755-for-permission-instead-of-0644.patch
 selftests-cgroup-test-open-time-credential-usage-for-migration-checks.patch
 selftests-cgroup-test-open-time-cgroup-namespace-usage-for-migration-checks.patch
+arm64-module-remove-noload-from-linker-script.patch