Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gj49D-0003R0-5s for mharc-grub-devel@gnu.org; Mon, 14 Jan 2019 10:27:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj495-0003MT-QN for grub-devel@gnu.org; Mon, 14 Jan 2019 10:27:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj492-00089G-Ab for grub-devel@gnu.org; Mon, 14 Jan 2019 10:27:21 -0500 Received: from mx2.suse.de ([195.135.220.15]:36410 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 1gj492-00088e-2Y for grub-devel@gnu.org; Mon, 14 Jan 2019 10:27:20 -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 D4758AF97; Mon, 14 Jan 2019 15:27:18 +0000 (UTC) From: Alexander Graf To: grub-devel@gnu.org Cc: Leif Lindholm , Peter Jones , Jon Masters , Ard Biesheuvel , Daniel Kiper Subject: [PATCH v3 4/4] mkimage: Align efi sections on 4k boundary Date: Mon, 14 Jan 2019 16:27:18 +0100 Message-Id: <20190114152718.60629-5-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20190114152718.60629-1-agraf@suse.de> References: <20190114152718.60629-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: , X-List-Received-Date: Mon, 14 Jan 2019 15:27:27 -0000 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. This brings us into sync with what the MS C compiler toolchain does. Signed-off-by: Alexander Graf --- util/mkimage.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/mkimage.c b/util/mkimage.c index 6b372cba5..a57f277ec 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -194,7 +194,7 @@ static const struct grub_install_image_target_desc image_targets[] = .decompressor_compressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD, - .section_align = GRUB_PE32_SECTION_ALIGNMENT, + .section_align = GRUB_EFI_PAGE_SIZE, .vaddr_offset = EFI32_HEADER_SIZE, .pe_target = GRUB_PE32_MACHINE_I386, .elf_target = EM_386, @@ -244,7 +244,7 @@ static const struct grub_install_image_target_desc image_targets[] = .decompressor_compressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD, - .section_align = GRUB_PE32_SECTION_ALIGNMENT, + .section_align = GRUB_EFI_PAGE_SIZE, .vaddr_offset = EFI64_HEADER_SIZE, .pe_target = GRUB_PE32_MACHINE_X86_64, .elf_target = EM_X86_64, @@ -421,7 +421,7 @@ static const struct grub_install_image_target_desc image_targets[] = .decompressor_compressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD, - .section_align = GRUB_PE32_SECTION_ALIGNMENT, + .section_align = GRUB_EFI_PAGE_SIZE, .vaddr_offset = EFI64_HEADER_SIZE, .pe_target = GRUB_PE32_MACHINE_IA64, .elf_target = EM_IA_64, @@ -602,7 +602,7 @@ static const struct grub_install_image_target_desc image_targets[] = .decompressor_compressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD, - .section_align = GRUB_PE32_SECTION_ALIGNMENT, + .section_align = GRUB_EFI_PAGE_SIZE, .vaddr_offset = EFI32_HEADER_SIZE, .pe_target = GRUB_PE32_MACHINE_ARMTHUMB_MIXED, .elf_target = EM_ARM, @@ -618,7 +618,7 @@ static const struct grub_install_image_target_desc image_targets[] = .decompressor_compressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD, - .section_align = GRUB_PE32_SECTION_ALIGNMENT, + .section_align = GRUB_EFI_PAGE_SIZE, .vaddr_offset = EFI64_HEADER_SIZE, .pe_target = GRUB_PE32_MACHINE_ARM64, .elf_target = EM_AARCH64, -- 2.12.3