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=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 C34BAC072B1 for ; Thu, 30 May 2019 04:30:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 90CA6255BE for ; Thu, 30 May 2019 04:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190606; bh=m+MFcebfE+eoqIOtZcJCxPk7qMcJECbsCQ1vSNgwBO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MhcZGoQwZhq2mKyxOcFM8f1l50/gMjjqMOuqiCjksVXAJvTW4lSMRZsukYQ6ppIoJ pfJ/s1NcE+YcQZ42OocXMh257rmReoVajYWX6h3EPIK4/Tf2wuCt99VaBNo9qoizxK iRPoEeb5b2obFOjya3oLm92AS+G3pE+OZGAahMvQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388043AbfE3EaG (ORCPT ); Thu, 30 May 2019 00:30:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:60758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729634AbfE3DN5 (ORCPT ); Wed, 29 May 2019 23:13:57 -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 0AAEF24569; Thu, 30 May 2019 03:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186037; bh=m+MFcebfE+eoqIOtZcJCxPk7qMcJECbsCQ1vSNgwBO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qgszChpUn9DRNfCIG6RXFqahyoKbeH2snuS5CexRTgpqhI/yeRpXGFaxknPn2HNO3 XGZi1KEG72H7Nvf7HGbmfkC2MAZinFSxmjjDkITEDjy9q3sR0XZNjwZL26okFKEFqX 5Q/0IZKcJOq9hqCBVAtQS8oV9aWiyfZ6kU/sS9pU= 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 5.0 124/346] x86/build: Move _etext to actual end of .text Date: Wed, 29 May 2019 20:03:17 -0700 Message-Id: <20190530030547.389030707@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 c45214c44e612..5cbce783d4d10 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 -- 2.20.1