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=-14.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 4BD5EC433E2 for ; Tue, 1 Sep 2020 11:53:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2625920FC3 for ; Tue, 1 Sep 2020 11:53:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="y2lJnKsF"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="bj85h0Q4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727947AbgIALxT (ORCPT ); Tue, 1 Sep 2020 07:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727822AbgIALs0 (ORCPT ); Tue, 1 Sep 2020 07:48:26 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1768C061249; Tue, 1 Sep 2020 04:48:00 -0700 (PDT) Date: Tue, 01 Sep 2020 11:47:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1598960876; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IKz2dGX6e3Y6/XXFTZl5HUybdot3NjxnC/Wq+WnaoPA=; b=y2lJnKsFm2wEOHIBNhA21u9xrkqQd+8FlGwW0QYh73bhKfLByO5RZU/wALtZQXlEwBaFmM IvW6KXCIM+IIShpAARrwsJRL8lHQfhxD2//52YNKfIg6/tDkLKRIa7XAp9txSpdCPGXyjW 6/rPe75TUNEXJm7JsC/F+xNTEjqEFDU3GKhGSXYWZuJpc7ZOL92/KzO/Qo2Ubzq3yLiZiD aw4CI0jhoaOMYDt/Fte2Hgjgu8FB0D/viVgQUj2FTevnNMT805fnF/eWpM8KoFRrma1hHf YUng4eFCNA0z9xDGa1ZLN9cYHaMnIIS4R+Do1KorH0uLhTif9ukfZW8Bs5fKNQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1598960876; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IKz2dGX6e3Y6/XXFTZl5HUybdot3NjxnC/Wq+WnaoPA=; b=bj85h0Q4AGdqoML/vEs8tCQRPXlqtvtkyASyFgkfegOiWOERzj3sZuXv8R24J7858pLG6t mrJXkjvNwW1tzhAQ== From: "tip-bot2 for Kees Cook" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/build] arm/build: Explicitly keep .ARM.attributes sections Cc: Nick Desaulniers , Kees Cook , Ingo Molnar , Fangrui Song , Russell King , x86 , LKML In-Reply-To: <20200821194310.3089815-17-keescook@chromium.org> References: <20200821194310.3089815-17-keescook@chromium.org> MIME-Version: 1.0 Message-ID: <159896087591.20229.4965158961256673819.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the core/build branch of tip: Commit-ID: 3b14aefb84320ac430cecbdc87b680317916b2bd Gitweb: https://git.kernel.org/tip/3b14aefb84320ac430cecbdc87b680317916b2bd Author: Kees Cook AuthorDate: Fri, 21 Aug 2020 12:42:57 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 01 Sep 2020 10:03:18 +02:00 arm/build: Explicitly keep .ARM.attributes sections In preparation for adding --orphan-handling=warn, explicitly keep the .ARM.attributes section (at address 0[1]) by expanding the existing ELF_DETAILS macro into ARM_DETAILS. [1] https://reviews.llvm.org/D85867 Suggested-by: Nick Desaulniers Signed-off-by: Kees Cook Signed-off-by: Ingo Molnar Reviewed-by: Fangrui Song Cc: Russell King Link: https://lore.kernel.org/lkml/CAKwvOdk-racgq5pxsoGS6Vtifbtrk5fmkmnoLxrQMaOvV0nPWw@mail.gmail.com/ Link: https://lore.kernel.org/r/20200821194310.3089815-17-keescook@chromium.org --- arch/arm/include/asm/vmlinux.lds.h | 4 ++++ arch/arm/kernel/vmlinux-xip.lds.S | 2 +- arch/arm/kernel/vmlinux.lds.S | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/vmlinux.lds.h b/arch/arm/include/asm/vmlinux.lds.h index a08f430..c4af518 100644 --- a/arch/arm/include/asm/vmlinux.lds.h +++ b/arch/arm/include/asm/vmlinux.lds.h @@ -52,6 +52,10 @@ ARM_MMU_DISCARD(*(__ex_table)) \ COMMON_DISCARDS +#define ARM_DETAILS \ + ELF_DETAILS \ + .ARM.attributes 0 : { *(.ARM.attributes) } + #define ARM_STUBS_TEXT \ *(.gnu.warning) \ *(.glue_7) \ diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S index 904c31f..57fcbf5 100644 --- a/arch/arm/kernel/vmlinux-xip.lds.S +++ b/arch/arm/kernel/vmlinux-xip.lds.S @@ -150,7 +150,7 @@ SECTIONS _end = .; STABS_DEBUG - ELF_DETAILS + ARM_DETAILS } /* diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index bb950c8..1d3d3b5 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -149,7 +149,7 @@ SECTIONS _end = .; STABS_DEBUG - ELF_DETAILS + ARM_DETAILS } #ifdef CONFIG_STRICT_KERNEL_RWX