From patchwork Fri Jan 25 11:45:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 156573 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp262205jaa; Fri, 25 Jan 2019 03:51:49 -0800 (PST) X-Google-Smtp-Source: ALg8bN6FjftpDKjYzN6FTQ3QDGZeO4+zLTwO38NE2KD3Q7h9j8bzo/PIhdNcmjcHtVnE0lQw/4rX X-Received: by 2002:adf:e149:: with SMTP id f9mr12054746wri.42.1548417108937; Fri, 25 Jan 2019 03:51:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548417108; cv=none; d=google.com; s=arc-20160816; b=C95+NoNiEQlCdaN1bc/4a+fxGM/J5MasSc45fvC5WRqjz2WHj4unOQrql/pa/U1GGc qd3hcWT73GnmQ3GEKga5wZNnC+56sZbthdeVwMr789Y9GfsT+exJZiwfTkMMUHhQVgKq 8A+t7lZa7YPewKRKECQITbt0tdb7J+1Mr9hvArOwuoktlX91farQ6im0xMEJizPgDjSi EmrRFFujKh9VuGoz5mQmJG00nFLFs5cyqHxQ/sajqFEYeC1d+YKhmZjsgdDN8bkTlzJs TcBchutaZJt0OkS7jWeTH4SATWLK/hTwNY8ez0RqZ+7fOApdlscJQQLey4C6CldC158Z dOOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from; bh=zswuIumg96/AWOuvKvfMIDDGkHz/gEpFE5Yovbm+eIE=; b=MMt+X0CgJndUNkj6Eyeg+FVYFJKQvfFjuTbH8EQ9ekvcCOZ+kV0amMcklESd5VMe02 uwfMuxfHrH1oeuuJSCw1uha/XH+N2DmWTLRLNk3S4C95njBXj0VNRpBzOojZwKK+il08 I56iZ4OGz2LKa/d+RJ87TELaRQxg2boVZnIYehipwEY7QeGfmLAxIcNibx0bHc3QmHrC Q3inZPozlrSjN0kkxvOxss1ablE79W1sgHtuZMN5cGFZ55B7wpNO+hrnY8UkYvhLCiDG kKbvfGKBgMeDJwdvJdM6JVJmlb4NE7eJEnyppirTnAKVp95zQlxl1JxbnFbRQeP2a4BS ZhUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 186si40423801wmc.87.2019.01.25.03.51.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Jan 2019 03:51:48 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org" Received: from localhost ([127.0.0.1]:43099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn01T-0001U5-W6 for patch@linaro.org; Fri, 25 Jan 2019 06:51:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmzzR-0008UX-Dk for grub-devel@gnu.org; Fri, 25 Jan 2019 06:49:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmzzP-0004Hk-Td for grub-devel@gnu.org; Fri, 25 Jan 2019 06:49:41 -0500 Received: from mx2.suse.de ([195.135.220.15]:52276 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmzzP-0004Bw-Jx for grub-devel@gnu.org; Fri, 25 Jan 2019 06:49:39 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D0AC7ADC9; Fri, 25 Jan 2019 11:49:28 +0000 (UTC) From: Alexander Graf To: grub-devel@gnu.org Subject: [PATCH v5 2/3] mkimage: Align efi sections on 4k boundary Date: Fri, 25 Jan 2019 12:45:15 +0100 Message-Id: <20190125114516.12127-3-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20190125114516.12127-1-agraf@suse.de> References: <20190125114516.12127-1-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Cc: Jon Masters , Leif Lindholm , Daniel Kiper MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" There is UEFI firmware popping up in the wild now that implements stricter permission checks using NX and write protect page table entry bits. This means that firmware now may fail to load binaries if its individual sections are not page aligned, as otherwise it can not ensure permission boundaries. So let's bump all efi section alignments up to 4k (EFI page size). That way we will stay compatible going forward. Unfortunately our internals can't deal very well with a mismatch of alignment between the virtual and file offsets, so we have to also pad our target binary a bit. Signed-off-by: Alexander Graf --- v4 -> v5: - Use GRUB_EFI_PAGE_SIZE - Add include to have above const defined --- include/grub/efi/pe32.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.12.3 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h index 7d44732d2..fe8a85ce6 100644 --- a/include/grub/efi/pe32.h +++ b/include/grub/efi/pe32.h @@ -20,6 +20,7 @@ #define GRUB_EFI_PE32_HEADER 1 #include +#include /* The MSDOS compatibility stub. This was copied from the output of objcopy, and it is not necessary to care about what this means. */ @@ -50,8 +51,13 @@ /* According to the spec, the minimal alignment is 512 bytes... But some examples (such as EFI drivers in the Intel Sample Implementation) use 32 bytes (0x20) instead, and it seems - to be working. For now, GRUB uses 512 bytes for safety. */ -#define GRUB_PE32_SECTION_ALIGNMENT 0x200 + to be working. + + However, there is firmware showing up in the field now with + page alignment constraints to guarantee that page protection + bits take effect. Because we can not easily distinguish between + in-memory and in-file layout, let's bump all alignment to 4k. */ +#define GRUB_PE32_SECTION_ALIGNMENT GRUB_EFI_PAGE_SIZE #define GRUB_PE32_FILE_ALIGNMENT GRUB_PE32_SECTION_ALIGNMENT struct grub_pe32_coff_header