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

4.14-stable patches

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

diff --git a/queue-4.14/arm64-module-remove-noload-from-linker-script.patch b/queue-4.14/arm64-module-remove-noload-from-linker-script.patch
new file mode 100644
index 00000000000..c95d2b5dc51
--- /dev/null
+++ b/queue-4.14/arm64-module-remove-noload-from-linker-script.patch
@@ -0,0 +1,48 @@
+From foo@baz Mon Apr 11 05:18:29 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 596b0474d3d9]
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/kernel/module.lds |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm64/kernel/module.lds
++++ b/arch/arm64/kernel/module.lds
+@@ -1,5 +1,5 @@
+ 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) }
+ }
diff --git a/queue-4.14/series b/queue-4.14/series
index 8b42231b747..28a59436ba6 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -257,3 +257,4 @@ irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch
 tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch
 dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch
 mm-don-t-skip-swap-entry-even-if-zap_details-specified.patch
+arm64-module-remove-noload-from-linker-script.patch