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,URIBL_BLOCKED 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 CCA0BC433E2 for ; Tue, 1 Sep 2020 14:55:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9646F20665 for ; Tue, 1 Sep 2020 14:55:54 +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="U7k2lYKQ"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="aAIn8IoO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728419AbgIAOzx (ORCPT ); Tue, 1 Sep 2020 10:55:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727815AbgIALs0 (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 EFBB9C061246; Tue, 1 Sep 2020 04:47:57 -0700 (PDT) Date: Tue, 01 Sep 2020 11:47:54 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1598960875; 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=FbqG1YikYHiBLEwEfDbLhy4c0U3oUUcvXguN9MUeGqc=; b=U7k2lYKQLOTziFb+QWRmZSh6MTv/uP1eTiJJdQzi6Q/JCocH0i1vKREsWFu1eTlS5+W2pm XdzS4JObGtFpok7TwpLPjc/IpKAn8NgYngHGhXPab7tB0fAQIIuAcU/qbnSQJDMUfeqZ2f ZbsVkUemaFnJgfUxBgJz+qKpbL327XulLIqgSrVWe//NqKWlYyBQ5P7Iqz2BqzvYunP0h0 r/SoTVnKXmyt8kzz09iT6GnqB2AQRY2coOEj9qlQyxFrNPkedexaNLZ23hpItuuOuCe0x4 Zq1RKbSkseMz+ZhFJYeaGpQO0uYcP4VnpTCeTS7nNUFshJEkSdqbQPpVhbiqBw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1598960875; 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=FbqG1YikYHiBLEwEfDbLhy4c0U3oUUcvXguN9MUeGqc=; b=aAIn8IoOT1nUcj6WHCzTch2bQkYEtf6PgdOW6eyAKCh/bPBT4jrfwlOlbNmfDcdOBs1Hjp FnkoQgaxAQB1LjCQ== 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/boot: Handle all sections explicitly Cc: Kees Cook , Ingo Molnar , Russell King , x86 , LKML In-Reply-To: <20200821194310.3089815-21-keescook@chromium.org> References: <20200821194310.3089815-21-keescook@chromium.org> MIME-Version: 1.0 Message-ID: <159896087466.20229.9387629554145292260.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: 7e8c4ed2638d08a1604c87b60ed7161bf92e6f86 Gitweb: https://git.kernel.org/tip/7e8c4ed2638d08a1604c87b60ed7161bf92e6f86 Author: Kees Cook AuthorDate: Fri, 21 Aug 2020 12:43:01 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 01 Sep 2020 10:03:18 +02:00 arm/boot: Handle all sections explicitly In preparation for warning on orphan sections, use common macros for debug sections, discards, and text stubs. Add discards for unwanted .note, and .rel sections. Signed-off-by: Kees Cook Signed-off-by: Ingo Molnar Cc: Russell King Link: https://lore.kernel.org/r/20200821194310.3089815-21-keescook@chromium.org --- arch/arm/boot/compressed/vmlinux.lds.S | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S index 09ac33f..b914be3 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.S +++ b/arch/arm/boot/compressed/vmlinux.lds.S @@ -2,6 +2,7 @@ /* * Copyright (C) 2000 Russell King */ +#include #ifdef CONFIG_CPU_ENDIAN_BE8 #define ZIMAGE_MAGIC(x) ( (((x) >> 24) & 0x000000ff) | \ @@ -17,8 +18,11 @@ ENTRY(_start) SECTIONS { /DISCARD/ : { + COMMON_DISCARDS *(.ARM.exidx*) *(.ARM.extab*) + *(.note.*) + *(.rel.*) /* * Discard any r/w data - this produces a link error if we have any, * which is required for PIC decompression. Local data generates @@ -36,9 +40,7 @@ SECTIONS *(.start) *(.text) *(.text.*) - *(.gnu.warning) - *(.glue_7t) - *(.glue_7) + ARM_STUBS_TEXT } .table : ALIGN(4) { _table_start = .; @@ -128,12 +130,10 @@ SECTIONS PROVIDE(__pecoff_data_size = ALIGN(512) - ADDR(.data)); PROVIDE(__pecoff_end = ALIGN(512)); - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } + STABS_DEBUG + DWARF_DEBUG + ARM_DETAILS + + ARM_ASSERTS } ASSERT(_edata_real == _edata, "error: zImage file size is incorrect");