Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gatsI-0002wL-7h for mharc-grub-devel@gnu.org; Sat, 22 Dec 2018 21:52:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gatsG-0002vf-1E for grub-devel@gnu.org; Sat, 22 Dec 2018 21:52:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gatsB-0006Jf-2Z for grub-devel@gnu.org; Sat, 22 Dec 2018 21:52:15 -0500 Received: from mx2.suse.de ([195.135.220.15]:44726 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 1gatsA-0006IJ-RI for grub-devel@gnu.org; Sat, 22 Dec 2018 21:52:10 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BDDB2AF3B; Sun, 23 Dec 2018 02:52:08 +0000 (UTC) From: Alexander Graf To: grub-devel@gnu.org Cc: Leif Lindholm , Peter Jones , Jon Masters , Ard Biesheuvel Subject: [PATCH v2 2/2] mkimage: arm64-efi: Align first section to page Date: Sun, 23 Dec 2018 03:52:07 +0100 Message-Id: <20181223025207.40755-3-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20181223025207.40755-1-agraf@suse.de> References: <20181223025207.40755-1-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] 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: , X-List-Received-Date: Sun, 23 Dec 2018 02:52:16 -0000 In order to enforce NX semantics on non-code pages, UEFI firmware may require that all code is EFI_PAGE_SIZE (4k) aligned. A similar change has recently been applied to edk2 to accomodate for the same fact: https://lists.01.org/pipermail/edk2-devel/2018-December/033708.html This patch adapts grub to also implement the same alignment guarantees and thus ensures we can boot even when strict permission checks are in place. Signed-off-by: Alexander Graf --- v1 -> v2: - Mention only NX requirement in patch description - Use GRUB_EFI_PAGE_SIZE --- util/mkimage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/mkimage.c b/util/mkimage.c index 88b991764..de93c5a13 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -623,7 +624,7 @@ static const struct grub_install_image_target_desc image_targets[] = .decompressor_uncompressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD, .section_align = GRUB_PE32_SECTION_ALIGNMENT, - .vaddr_offset = EFI64_HEADER_SIZE, + .vaddr_offset = GRUB_EFI_PAGE_SIZE, .pe_target = GRUB_PE32_MACHINE_ARM64, .elf_target = EM_AARCH64, }, -- 2.12.3