This is a note to let you know that I've just added the patch titled
x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-vmlinux.lds-add-runtime_discard_exit-to-generic-discards.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Thu Mar 2 03:07:26 2023
From: Tom Saeger <tom.saeger@xxxxxxxxxx>
Date: Wed, 1 Mar 2023 19:06:59 -0700
Subject: x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS
To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>, Tom Saeger <tom.saeger@xxxxxxxxxx>, stable@xxxxxxxxxxxxxxx, "H.J. Lu" <hjl.tools@xxxxxxxxx>, Kees Cook <keescook@xxxxxxxxxxxx>
Message-ID: <20230210-tsaeger-upstream-linux-stable-5-4-v3-1-122fc5440d4c@xxxxxxxxxx>
From: "H.J. Lu" <hjl.tools@xxxxxxxxx>
commit 84d5f77fc2ee4e010c2c037750e32f06e55224b0 upstream.
In the x86 kernel, .exit.text and .exit.data sections are discarded at
runtime, not by the linker. Add RUNTIME_DISCARD_EXIT to generic DISCARDS
and define it in the x86 kernel linker script to keep them.
The sections are added before the DISCARD directive so document here
only the situation explicitly as this change doesn't have any effect on
the generated kernel. Also, other architectures like ARM64 will use it
too so generalize the approach with the RUNTIME_DISCARD_EXIT define.
[ bp: Massage and extend commit message. ]
Signed-off-by: H.J. Lu <hjl.tools@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/20200326193021.255002-1-hjl.tools@xxxxxxxxx
Signed-off-by: Tom Saeger <tom.saeger@xxxxxxxxxx>
---
arch/x86/kernel/vmlinux.lds.S | 2 ++
include/asm-generic/vmlinux.lds.h | 11 +++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -21,6 +21,8 @@
#define LOAD_OFFSET __START_KERNEL_map
#endif
+#define RUNTIME_DISCARD_EXIT
+
#include <asm-generic/vmlinux.lds.h>
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -900,10 +900,17 @@
* section definitions so that such archs put those in earlier section
* definitions.
*/
+#ifdef RUNTIME_DISCARD_EXIT
+#define EXIT_DISCARDS
+#else
+#define EXIT_DISCARDS \
+ EXIT_TEXT \
+ EXIT_DATA
+#endif
+
#define DISCARDS \
/DISCARD/ : { \
- EXIT_TEXT \
- EXIT_DATA \
+ EXIT_DISCARDS \
EXIT_CALL \
*(.discard) \
*(.discard.*) \
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-5.4/powerpc-vmlinux.lds-don-t-discard-.rela-for-relocatable-builds.patch
queue-5.4/s390-define-runtime_discard_exit-to-fix-link-error-with-gnu-ld-2.36.patch
queue-5.4/powerpc-vmlinux.lds-define-runtime_discard_exit.patch
queue-5.4/sh-define-runtime_discard_exit.patch
queue-5.4/x86-vmlinux.lds-add-runtime_discard_exit-to-generic-discards.patch
queue-5.4/arch-fix-broken-buildid-for-arm64-and-riscv.patch
