From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D286AC282CE for ; Wed, 22 May 2019 19:32:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D3B4217D9 for ; Wed, 22 May 2019 19:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553529; bh=P9EaZvPN5ixa+/d96A56l5O32Bn1X/A3te1E3JKdMeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FRLeQAWBuNxP38AQRcEx1KpJf9+9TFlcD/8xwk9tj26TTGJF+Bckaq6NI+albMwBQ s4oJiPS5eYTB9IifPFj7vpuCmmvz22+S4en7nYtx14ZcGgW9O3uReg6guBs+rQOOO7 l2M8T0dwo7Y825FbsqbAZpcNj7nQpXSQjkGSUu+E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732143AbfEVTcI (ORCPT ); Wed, 22 May 2019 15:32:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:55734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733301AbfEVTcD (ORCPT ); Wed, 22 May 2019 15:32:03 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AF7CB20675; Wed, 22 May 2019 19:32:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553522; bh=P9EaZvPN5ixa+/d96A56l5O32Bn1X/A3te1E3JKdMeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mkBacXWidHlgFh2u2nnYmh/POo/cyv36vGJC/dvFDYHeVLcdD8HKeh0EbcJIFLgZQ 64Rwj//oR0keQqRj0YrUfT5QDeBO/Jt5Clp4x80Y0SXVO54ZZLhR4EGj5b1oo59xMq f71bZ+yOthTyT/DDqBRB364GR+h4e9iNtbjxCv1k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Sami Tolvanen , Borislav Petkov , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.4 23/92] x86/build: Move _etext to actual end of .text Date: Wed, 22 May 2019 15:30:18 -0400 Message-Id: <20190522193127.27079-23-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522193127.27079-1-sashal@kernel.org> References: <20190522193127.27079-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kees Cook [ Upstream commit 392bef709659abea614abfe53cf228e7a59876a4 ] 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 Signed-off-by: Kees Cook Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20190423183827.GA4012@beast Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- 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 17e1e60b6b400..68dd72248919b 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -110,11 +110,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 -- 2.20.1