From 44c98e8f96ce21c7f9310726137f7573fdb802db Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 11 Apr 2022 17:19:02 +0200 Subject: [PATCH] 4.9-stable patches added patches: arm64-module-remove-noload-from-linker-script.patch --- ...ule-remove-noload-from-linker-script.patch | 44 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 queue-4.9/arm64-module-remove-noload-from-linker-script.patch diff --git a/queue-4.9/arm64-module-remove-noload-from-linker-script.patch b/queue-4.9/arm64-module-remove-noload-from-linker-script.patch new file mode 100644 index 00000000000..cdd13fca47e --- /dev/null +++ b/queue-4.9/arm64-module-remove-noload-from-linker-script.patch @@ -0,0 +1,44 @@ +From foo@baz Mon Apr 11 05:18:36 PM CEST 2022 +From: Fangrui Song +Date: Fri, 18 Feb 2022 00:12:09 -0800 +Subject: arm64: module: remove (NOLOAD) from linker script + +From: Fangrui Song + +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=) 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 +Reported-by: Nathan Chancellor +Signed-off-by: Fangrui Song +Acked-by: Ard Biesheuvel +Link: https://lore.kernel.org/r/20220218081209.354383-1-maskray@google.com +Signed-off-by: Will Deacon +[nathan: Fix conflicts due to lack of 596b0474d3d9, be0f272bfc83, and 24af6c4e4e0f] +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/kernel/module.lds | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/kernel/module.lds ++++ b/arch/arm64/kernel/module.lds +@@ -1,3 +1,3 @@ + SECTIONS { +- .plt (NOLOAD) : { BYTE(0) } ++ .plt : { BYTE(0) } + } diff --git a/queue-4.9/series b/queue-4.9/series index d49d7c0aea9..b0625a887be 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -198,3 +198,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 -- 2.47.3