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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 ADA54C28CC2 for ; Thu, 30 May 2019 04:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DE1725153 for ; Thu, 30 May 2019 04:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559189435; bh=6h26VJK8y3zY9Qgl+h44YIBxuwaD1N9LgE/Wq8QcILc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=umK36Kl0YDy5xwIviqqKNoy7a5sARl99Rb1WQK43+pTzqAXkP+xpAxetFZ48jYJ+t QW8r8EfasWP4mrc3Ot01OZ6V3gbl5Sd4bqTlVZprFFFGF+e8dBeX3OkjlHc8yf4+Tl SuO8jJNdrTXJ6lP1pvACfLX+7NhYzuMH+entXf24= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727117AbfE3EK0 (ORCPT ); Thu, 30 May 2019 00:10:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:44490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730041AbfE3DRA (ORCPT ); Wed, 29 May 2019 23:17:00 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F020624646; Thu, 30 May 2019 03:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186220; bh=6h26VJK8y3zY9Qgl+h44YIBxuwaD1N9LgE/Wq8QcILc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O84W8lldKYZ3VklVv6HCnTV/vuyL2H2ycTvs2UJO40TCAhrcJmC+tH5UKYRPKU7TB x+eW7w0bCNqQsedNjgErMqR9QOCvpxj/lwVNHMzGRxIAkUWOgf1hw0lyWF8qN94ekW 6dx7ZdmaV46ZknwQnWndsOvrj+OAF1696H4afOTE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook , Borislav Petkov , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Sasha Levin , Sami Tolvanen Subject: [PATCH 4.19 110/276] x86/build: Move _etext to actual end of .text Date: Wed, 29 May 2019 20:04:28 -0700 Message-Id: <20190530030532.875031639@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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 85e6d5620188e..2fb152d813c17 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -151,11 +151,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