From 3b83409165c330463f40a4c9e89256a16f4eef29 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 19 Mar 2022 09:16:54 +0100 Subject: [PATCH] 5.4-stable patches added patches: fixup-for-arm64-entry-add-macro-for-reading-symbol-address-from-the-trampoline.patch --- ...g-symbol-address-from-the-trampoline.patch | 47 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 48 insertions(+) create mode 100644 queue-5.4/fixup-for-arm64-entry-add-macro-for-reading-symbol-address-from-the-trampoline.patch diff --git a/queue-5.4/fixup-for-arm64-entry-add-macro-for-reading-symbol-address-from-the-trampoline.patch b/queue-5.4/fixup-for-arm64-entry-add-macro-for-reading-symbol-address-from-the-trampoline.patch new file mode 100644 index 00000000000..c84c90e110f --- /dev/null +++ b/queue-5.4/fixup-for-arm64-entry-add-macro-for-reading-symbol-address-from-the-trampoline.patch @@ -0,0 +1,47 @@ +From james.morse@arm.com Sat Mar 19 09:15:51 2022 +From: James Morse +Date: Fri, 18 Mar 2022 17:37:13 +0000 +Subject: fixup for "arm64 entry: Add macro for reading symbol address from the trampoline" +To: Greg Kroah-Hartman +Cc: James Morse , Florian Fainelli , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Catalin Marinas , Sasha Levin +Message-ID: <20220318173713.2320567-1-james.morse@arm.com> + +From: James Morse + +__sdei_asm_trampoline_next_handler shouldn't have its own name as the +tramp_data_read_var takes the symbol name, and generates the name for +the value in the data page if CONFIG_RANDOMIZE_BASE is clear. + +This means when CONFIG_RANDOMIZE_BASE is clear, this code won't compile +as __sdei_asm_trampoline_next_handler doesn't exist. + +Use the proper name, and let the macro do its thing. + +Reported-by: Florian Fainelli +Tested-by: Florian Fainelli +Signed-off-by: James Morse +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/kernel/entry.S | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm64/kernel/entry.S ++++ b/arch/arm64/kernel/entry.S +@@ -1199,7 +1199,7 @@ __entry_tramp_data_start: + __entry_tramp_data_vectors: + .quad vectors + #ifdef CONFIG_ARM_SDE_INTERFACE +-__entry_tramp_data___sdei_asm_trampoline_next_handler: ++__entry_tramp_data___sdei_asm_handler: + .quad __sdei_asm_handler + #endif /* CONFIG_ARM_SDE_INTERFACE */ + __entry_tramp_data_this_cpu_vector: +@@ -1331,7 +1331,7 @@ ENTRY(__sdei_asm_entry_trampoline) + */ + 1: str x4, [x1, #(SDEI_EVENT_INTREGS + S_ORIG_ADDR_LIMIT)] + +- tramp_data_read_var x4, __sdei_asm_trampoline_next_handler ++ tramp_data_read_var x4, __sdei_asm_handler + br x4 + ENDPROC(__sdei_asm_entry_trampoline) + NOKPROBE(__sdei_asm_entry_trampoline) diff --git a/queue-5.4/series b/queue-5.4/series index c869396f8c9..b28a773fe90 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -40,3 +40,4 @@ nl80211-update-bss-channel-on-channel-switch-for-p2p.patch tcp-make-tcp_read_sock-more-robust.patch sfc-extend-the-locking-on-mcdi-seqno.patch kselftest-vm-fix-tests-build-with-old-libc.patch +fixup-for-arm64-entry-add-macro-for-reading-symbol-address-from-the-trampoline.patch -- 2.47.3