The following commit has been merged into the x86/build branch of tip:
Commit-ID: 7a42d41d9dc2829bdf589db855ce3f948de2da6b
Gitweb:
https://git.kernel.org/tip/7a42d41d9dc2829bdf589db855ce3f948de2da6b
Author: Kees Cook <keesc...@chromium.org>
AuthorDate: Tue, 29 Oct 2019 14:13:29 -07:00
Committer: Borislav Petkov <b...@suse.de>
CommitterDate: Mon, 04 Nov 2019 15:34:36 +01:00
x86/vmlinux: Restore "text" Program Header with dummy section
In a linker script, if one places a section in one or more segments using
":PHDR", then the linker will place all subsequent allocatable sections,
which do not specify ":PHDR", into the same segments. In order to have
the NOTES section in both PT_LOAD (":text") and PT_NOTE (":note"), both
segments are marked, and the only way to undo this to keep subsequent
sections out of PT_NOTE is to mark the following section with just the
single desired PT_LOAD (":text").
In preparation for having a common NOTES macro, perform the segment
assignment using a dummy section (as done by other architectures).
Signed-off-by: Kees Cook <keesc...@chromium.org>
Signed-off-by: Borislav Petkov <b...@suse.de>
Cc: Andy Lutomirski <l...@kernel.org>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: Dave Hansen <dave.han...@linux.intel.com>
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Michal Simek <mon...@monstr.eu>
Cc: Rick Edgecombe <rick.p.edgeco...@intel.com>
Cc: Segher Boessenkool <seg...@kernel.crashing.org>
Cc: Will Deacon <w...@kernel.org>
Cc: Yoshinori Sato <ys...@users.sourceforge.jp>
Cc: x86-ml <x...@kernel.org>
Link: https://lkml.kernel.org/r/20191029211351.13243-8-keesc...@chromium.org
---
arch/x86/kernel/vmlinux.lds.S | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index e2feacf..788e789 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -147,8 +147,9 @@ SECTIONS
} :text = 0x9090
NOTES :text :note
+ .dummy : { *(.dummy) } :text
- EXCEPTION_TABLE(16) :text = 0x9090
+ EXCEPTION_TABLE(16)
/* .text should occupy whole number of pages */
. = ALIGN(PAGE_SIZE);
