forked from pool/grub2
be3181b1eb
- VUL-0: grub2,shim: implement new SBAT method (bsc#1182057) * 0031-util-mkimage-Remove-unused-code-to-add-BSS-section.patch * 0032-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch * 0033-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch * 0034-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch * 0035-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch * 0036-util-mkimage-Improve-data_size-value-calculation.patch * 0037-util-mkimage-Refactor-section-setup-to-use-a-helper.patch * 0038-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch * 0039-grub-install-common-Add-sbat-option.patch - Fix CVE-2021-20225 (bsc#1182262) * 0022-lib-arg-Block-repeated-short-options-that-require-an.patch - Fix CVE-2020-27749 (bsc#1179264) * 0024-kern-parser-Fix-resource-leak-if-argc-0.patch * 0025-kern-parser-Fix-a-memory-leak.patch * 0026-kern-parser-Introduce-process_char-helper.patch * 0027-kern-parser-Introduce-terminate_arg-helper.patch * 0028-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch * 0029-kern-buffer-Add-variable-sized-heap-buffer.patch * 0030-kern-parser-Fix-a-stack-buffer-overflow.patch - Fix CVE-2021-20233 (bsc#1182263) * 0023-commands-menuentry-Fix-quoting-in-setparams_prefix.patch - Fix CVE-2020-25647 (bsc#1177883) * 0021-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch - Fix CVE-2020-25632 (bsc#1176711) * 0020-dl-Only-allow-unloading-modules-that-are-not-depende.patch - Fix CVE-2020-27779, CVE-2020-14372 (bsc#1179265) (bsc#1175970) * 0001-include-grub-i386-linux.h-Include-missing-grub-types.patch * 0002-efi-Make-shim_lock-GUID-and-protocol-type-public.patch * 0003-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch OBS-URL: https://build.opensuse.org/request/show/876326 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=374
73 lines
3.4 KiB
Diff
73 lines
3.4 KiB
Diff
From fbacfa8211adbd1acaf264f7b1292781121a7195 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 15 Feb 2021 14:21:48 +0100
|
|
Subject: [PATCH 35/46] util/mkimage: Reorder PE optional header fields set-up
|
|
|
|
This makes the PE32 and PE32+ header fields set-up easier to follow by
|
|
setting them closer to the initialization of their related sections.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
util/mkimage.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/util/mkimage.c b/util/mkimage.c
|
|
index a039039db..deaef5666 100644
|
|
--- a/util/mkimage.c
|
|
+++ b/util/mkimage.c
|
|
@@ -1332,16 +1332,12 @@ grub_install_generate_image (const char *dir, const char *prefix,
|
|
sections = o64 + 1;
|
|
}
|
|
|
|
- PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size);
|
|
- PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size);
|
|
+ PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size);
|
|
PE_OHDR (o32, o64, entry_addr) = grub_host_to_target32 (layout.start_address);
|
|
- PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size);
|
|
-
|
|
PE_OHDR (o32, o64, image_base) = 0;
|
|
+ PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size);
|
|
PE_OHDR (o32, o64, section_alignment) = grub_host_to_target32 (image_target->section_align);
|
|
PE_OHDR (o32, o64, file_alignment) = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT);
|
|
- PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size);
|
|
- PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size);
|
|
PE_OHDR (o32, o64, subsystem) = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
|
|
|
|
/* Do these really matter? */
|
|
@@ -1351,10 +1347,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
|
|
PE_OHDR (o32, o64, heap_commit_size) = grub_host_to_target32 (0x10000);
|
|
|
|
PE_OHDR (o32, o64, num_data_directories) = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
|
|
- PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr);
|
|
- PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size);
|
|
|
|
/* The sections. */
|
|
+ PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size);
|
|
+ PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size);
|
|
text_section = sections;
|
|
strcpy (text_section->name, ".text");
|
|
text_section->virtual_size = grub_host_to_target32 (layout.exec_size);
|
|
@@ -1366,6 +1362,8 @@ grub_install_generate_image (const char *dir, const char *prefix,
|
|
| GRUB_PE32_SCN_MEM_EXECUTE
|
|
| GRUB_PE32_SCN_MEM_READ);
|
|
|
|
+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size);
|
|
+
|
|
data_section = text_section + 1;
|
|
strcpy (data_section->name, ".data");
|
|
data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size);
|
|
@@ -1388,6 +1386,8 @@ grub_install_generate_image (const char *dir, const char *prefix,
|
|
| GRUB_PE32_SCN_MEM_READ
|
|
| GRUB_PE32_SCN_MEM_WRITE);
|
|
|
|
+ PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr);
|
|
+ PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size);
|
|
reloc_section = mods_section + 1;
|
|
strcpy (reloc_section->name, ".reloc");
|
|
reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size);
|
|
--
|
|
2.26.2
|
|
|