Commit 87386764 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman

x86/build: Move _etext to actual end of .text

[ Upstream commit 392bef70 ]

When building x86 with Clang LTO and CFI, CFI jump regions are
automatically added to the end of the .text section late in linking. As a
result, the _etext position was being labelled before the appended jump
regions, causing confusion about where the boundaries of the executable
region actually are in the running kernel, and broke at least the fault
injection code. This moves the _etext mark to outside (and immediately
after) the .text area, as it already the case on other architectures
(e.g. arm64, arm).
Reported-and-tested-by: default avatarSami Tolvanen <samitolvanen@google.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20190423183827.GA4012@beastSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 56df2dbe
...@@ -111,11 +111,11 @@ SECTIONS ...@@ -111,11 +111,11 @@ SECTIONS
*(.text.__x86.indirect_thunk) *(.text.__x86.indirect_thunk)
__indirect_thunk_end = .; __indirect_thunk_end = .;
#endif #endif
/* End of text section */
_etext = .;
} :text = 0x9090 } :text = 0x9090
/* End of text section */
_etext = .;
NOTES :text :note NOTES :text :note
EXCEPTION_TABLE(16) :text = 0x9090 EXCEPTION_TABLE(16) :text = 0x9090
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment