From patchwork Fri Sep 15 09:37:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 140651 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1282271vqi; Fri, 15 Sep 2023 12:48:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4d+nX+HJWbtvQ9RXAIv9wixshdXY7B0XN8fSfwonDBXP/zg1hiAyc1DxZDBTh2uTYfFPH X-Received: by 2002:a17:90b:390e:b0:274:6135:835e with SMTP id ob14-20020a17090b390e00b002746135835emr2510648pjb.39.1694807322686; Fri, 15 Sep 2023 12:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694807322; cv=none; d=google.com; s=arc-20160816; b=O+TE0bSpN41to0hZvFzDaAt/mx1e80lKF/vxaYrFSC6XYMwlcs0ueAz0FG2hHgeUhM oVG4b252EVXlH3RCs1WIWGFpJyNOcNv/MMiDXFMaUVyRCw0NCHP1Kw5Keh7F9IJvLM4R AhfePiUKl7w7m8OilKBwxiVmHeDALb+P2ORhheKgtbOWflQnmi2VjPGOm0JmJu98yseR QveWEMbWPfyxKfPBg6w6Ii5WGEkSULx9l0fssTtaNU32QCP8NIqqEzAxwA7GIW5FwepJ cHf6xziG8WQmOePP4QbmNBS//NCwxlbhrnyk6YfkoSKBDt6TcMUx5u6BPf+NrsfIha3k 2m/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=0bCKWANC2GXvzvUx2vkt1IGRivAk16ALP4TvP76bo+4=; fh=mh/EFXDyWz6SYA4qEbcbMgOZ07AT4DlRJonTEXgTb50=; b=VCppiAjCEywCprJeXvZd5q8iyoE2VQP43oLTvBzp1GSecOVnwCWXd3KoszEOIDkW62 Deooyk8qnf9ucBAqY/OpRz96iQNCdREbFITnQNaEqG9EDvdoWnLhmAuliLs+o4Ig3a9x mBkFRP/iuzt3KoE93wNqiF6omorh9qz3ylBQ2zpIIsmKeIVGIRBhRpr1ZHR0EDZd3tR9 ItJw2i4mLSTcuNsmtEH23FvswA31/h6XBtnpFqbNxQykrLlIWj5lE8dK1666zAaaehgQ keQhXg8qgdLXoPJIDHaF565RMfpZmGeR4HgNE0ltYL6j7wPD4w7r38xLNUGiJUYUWeOR jBiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tTMDtsU0; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=9H0WzwOg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id nl13-20020a17090b384d00b00269584b6a10si4155405pjb.15.2023.09.15.12.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:48:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tTMDtsU0; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=9H0WzwOg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 0A46A83C634A; Fri, 15 Sep 2023 02:38:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233854AbjIOJif (ORCPT + 32 others); Fri, 15 Sep 2023 05:38:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233785AbjIOJi3 (ORCPT ); Fri, 15 Sep 2023 05:38:29 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 872FD1FFA; Fri, 15 Sep 2023 02:38:09 -0700 (PDT) Date: Fri, 15 Sep 2023 09:37:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694770669; 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=0bCKWANC2GXvzvUx2vkt1IGRivAk16ALP4TvP76bo+4=; b=tTMDtsU0+khuJpFGwX0ejZyYNxb2rGnjR8eLr22bGdn94qpBXFY4E92WjskcVzgU7AafLH 9mtbR8SvOWQUYUN5Le/9XuTGSB1lt2F0LT4GkKJ6DG/qC8liZcmBHPDSWUbpyg1gt9fQ+R bJkU63Yen8Geg6W+YakCypetaD56Oxtiara/u3qkmI1zL6S3BsoYo+ntW9yQHuHr9JW8Zc +l+Ri2GEKE3OgGGnsaj8VKEoJynaIzeTZNFeE/3l6I74RoJ3p7XxdDntv2/VS0L+h3caVl EBU5lIXhBxBd5OrztkG2Aoo/+SzXj2F8IP0K2roXx4AwutHda15ADdYcURyOMA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694770669; 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=0bCKWANC2GXvzvUx2vkt1IGRivAk16ALP4TvP76bo+4=; b=9H0WzwOgfkjKB4b1ZAa3MFn874cRBtrEElkoFEMG9Gsp5YWTbdbEatlXc8tFscBuLUwRXT /QmzD7lf8eEgyiAQ== From: "tip-bot2 for Ard Biesheuvel" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/efi: Drop alignment flags from PE section headers Cc: Ard Biesheuvel , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230912090051.4014114-20-ardb@google.com> References: <20230912090051.4014114-20-ardb@google.com> MIME-Version: 1.0 Message-ID: <169477066885.27769.9830822733543215583.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 15 Sep 2023 02:38:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776938430188959406 X-GMAIL-MSGID: 1777134283497875367 The following commit has been merged into the x86/boot branch of tip: Commit-ID: bfab35f552ab3dd6d017165bf9de1d1d20f198cc Gitweb: https://git.kernel.org/tip/bfab35f552ab3dd6d017165bf9de1d1d20f198cc Author: Ard Biesheuvel AuthorDate: Tue, 12 Sep 2023 09:00:54 Committer: Ingo Molnar CommitterDate: Fri, 15 Sep 2023 11:18:41 +02:00 x86/efi: Drop alignment flags from PE section headers The section header flags for alignment are documented in the PE/COFF spec as being applicable to PE object files only, not to PE executables such as the Linux bzImage, so let's drop them from the PE header. Signed-off-by: Ard Biesheuvel Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230912090051.4014114-20-ardb@google.com --- arch/x86/boot/header.S | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index b04ca8e..8c8148d 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -209,8 +209,7 @@ section_table: .word 0 # NumberOfLineNumbers .long IMAGE_SCN_CNT_CODE | \ IMAGE_SCN_MEM_READ | \ - IMAGE_SCN_MEM_EXECUTE | \ - IMAGE_SCN_ALIGN_16BYTES # Characteristics + IMAGE_SCN_MEM_EXECUTE # Characteristics # # The EFI application loader requires a relocation section @@ -230,8 +229,7 @@ section_table: .word 0 # NumberOfLineNumbers .long IMAGE_SCN_CNT_INITIALIZED_DATA | \ IMAGE_SCN_MEM_READ | \ - IMAGE_SCN_MEM_DISCARDABLE | \ - IMAGE_SCN_ALIGN_1BYTES # Characteristics + IMAGE_SCN_MEM_DISCARDABLE # Characteristics #ifdef CONFIG_EFI_MIXED # @@ -249,8 +247,7 @@ section_table: .word 0 # NumberOfLineNumbers .long IMAGE_SCN_CNT_INITIALIZED_DATA | \ IMAGE_SCN_MEM_READ | \ - IMAGE_SCN_MEM_DISCARDABLE | \ - IMAGE_SCN_ALIGN_1BYTES # Characteristics + IMAGE_SCN_MEM_DISCARDABLE # Characteristics #endif # @@ -271,8 +268,7 @@ section_table: .word 0 # NumberOfLineNumbers .long IMAGE_SCN_CNT_CODE | \ IMAGE_SCN_MEM_READ | \ - IMAGE_SCN_MEM_EXECUTE | \ - IMAGE_SCN_ALIGN_16BYTES # Characteristics + IMAGE_SCN_MEM_EXECUTE # Characteristics .set section_count, (. - section_table) / 40 #endif /* CONFIG_EFI_STUB */