Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 24 Apr 2019 04:12:52 -0700
From:   tip-bot for Kees Cook <tipbot@zytor.com>
Message-ID: <tip-392bef709659abea614abfe53cf228e7a59876a4@git.kernel.org>
Cc:     linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org,
        hpa@zytor.com, keescook@chromium.org, samitolvanen@google.com,
        tglx@linutronix.de, peterz@infradead.org,
        torvalds@linux-foundation.org
Reply-To: peterz@infradead.org, torvalds@linux-foundation.org, bp@suse.de,
          linux-kernel@vger.kernel.org, tglx@linutronix.de,
          samitolvanen@google.com, keescook@chromium.org, hpa@zytor.com,
          mingo@kernel.org
In-Reply-To: <20190423183827.GA4012@beast>
References: <20190423183827.GA4012@beast>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/mm] x86/build: Move _etext to actual end of .text
Git-Commit-ID: 392bef709659abea614abfe53cf228e7a59876a4
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  392bef709659abea614abfe53cf228e7a59876a4
Gitweb:     https://git.kernel.org/tip/392bef709659abea614abfe53cf228e7a59876a4
Author:     Kees Cook <keescook@chromium.org>
AuthorDate: Tue, 23 Apr 2019 11:38:27 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 24 Apr 2019 12:27:47 +0200

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

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: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Kees 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@beast
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/vmlinux.lds.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index bad8c51fee6e..de94da2366e7 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -141,11 +141,11 @@ SECTIONS
 		*(.text.__x86.indirect_thunk)
 		__indirect_thunk_end = .;
 #endif
-
-		/* End of text section */
-		_etext = .;
 	} :text = 0x9090
 
+	/* End of text section */
+	_etext = .;
+
 	NOTES :text :note
 
 	EXCEPTION_TABLE(16) :text = 0x9090