From b37d89db90566cc1dcab9fe5713bde142fbc8f63 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 23 Nov 2023 14:54:12 +0000 Subject: [efi] Fix recorded overall size of headers in NT optional header Commit 1e4c378 ("[efi] Shrink size of data directory in PE header") reduced the number of entries used in the data directory and reduced the recorded size of the NT "optional" header, but did not also adjust the recorded overall size of the PE headers, resulting in unused space between the PE headers and the first section. Fix by reducing the initial recorded size of the PE headers by the size of the omitted data directory entries. Signed-off-by: Michael Brown --- src/util/elf2efi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/util/elf2efi.c') diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c index a807491..76d02f2 100644 --- a/src/util/elf2efi.c +++ b/src/util/elf2efi.c @@ -230,7 +230,12 @@ static struct pe_header efi_pe_header = { .SectionAlignment = EFI_IMAGE_ALIGN, .FileAlignment = EFI_FILE_ALIGN, .SizeOfImage = EFI_IMAGE_ALIGN, - .SizeOfHeaders = sizeof ( efi_pe_header ), + .SizeOfHeaders = + ( sizeof ( efi_pe_header ) - + ( ( EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES - + NUMBER_OF_DIRECTORY_ENTRIES ) * + sizeof ( efi_pe_header.nt.OptionalHeader. + DataDirectory[0] ) ) ), .DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT, .NumberOfRvaAndSizes = NUMBER_OF_DIRECTORY_ENTRIES, -- cgit v1.1