| Patrick Williams | 2a25492 | 2023-08-11 09:48:11 -0500 | [diff] [blame] | 1 | From d082d6502fa86e08dda858933838dde0406b824f Mon Sep 17 00:00:00 2001 |
| 2 | From: Jan Janssen <medhefgo@web.de> |
| 3 | Date: Sun, 30 Jul 2023 20:59:04 +0200 |
| 4 | Subject: [PATCH] elf2efi: Fix header size calculation |
| 5 | |
| 6 | The PE header size calculation failed to take the PE magic and coff |
| 7 | header size into account, which will lead to header truncation if we are |
| 8 | writing only 5 sections. |
| 9 | |
| 10 | Upstream-Status: Backport [https://github.com/systemd/systemd/commit/ee91e06a5841c30bc7306260528ef407e0ebbab3] |
| 11 | |
| 12 | Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> |
| 13 | --- |
| 14 | tools/elf2efi.py | 12 ++++++++++-- |
| 15 | 1 file changed, 10 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/tools/elf2efi.py b/tools/elf2efi.py |
| 18 | index e233c8e3ab..2e478940f5 100755 |
| 19 | --- a/tools/elf2efi.py |
| 20 | +++ b/tools/elf2efi.py |
| 21 | @@ -210,6 +210,7 @@ FILE_ALIGNMENT = 512 |
| 22 | |
| 23 | # Nobody cares about DOS headers, so put the PE header right after. |
| 24 | PE_OFFSET = 64 |
| 25 | +PE_MAGIC = b"PE\0\0" |
| 26 | |
| 27 | |
| 28 | def align_to(x: int, align: int) -> int: |
| 29 | @@ -304,7 +305,10 @@ def copy_sections(elf: ELFFile, opt: PeOptionalHeader) -> typing.List[PeSection] |
| 30 | |
| 31 | |
| 32 | def apply_elf_relative_relocation( |
| 33 | - reloc: ElfRelocation, image_base: int, sections: typing.List[PeSection], addend_size: int |
| 34 | + reloc: ElfRelocation, |
| 35 | + image_base: int, |
| 36 | + sections: typing.List[PeSection], |
| 37 | + addend_size: int, |
| 38 | ): |
| 39 | # fmt: off |
| 40 | [target] = [ |
| 41 | @@ -439,7 +443,7 @@ def write_pe( |
| 42 | file.seek(0x3C, io.SEEK_SET) |
| 43 | file.write(PE_OFFSET.to_bytes(2, byteorder="little")) |
| 44 | file.seek(PE_OFFSET, io.SEEK_SET) |
| 45 | - file.write(b"PE\0\0") |
| 46 | + file.write(PE_MAGIC) |
| 47 | file.write(coff) |
| 48 | file.write(opt) |
| 49 | |
| 50 | @@ -453,6 +457,8 @@ def write_pe( |
| 51 | file.write(pe_s) |
| 52 | offset = align_to(offset + len(pe_s.data), FILE_ALIGNMENT) |
| 53 | |
| 54 | + assert file.tell() <= opt.SizeOfHeaders |
| 55 | + |
| 56 | for pe_s in sections: |
| 57 | file.seek(pe_s.PointerToRawData, io.SEEK_SET) |
| 58 | file.write(pe_s.data) |
| 59 | @@ -515,6 +521,8 @@ def elf2efi(args: argparse.Namespace): |
| 60 | |
| 61 | opt.SizeOfHeaders = align_to( |
| 62 | PE_OFFSET |
| 63 | + + len(PE_MAGIC) |
| 64 | + + sizeof(PeCoffHeader) |
| 65 | + coff.SizeOfOptionalHeader |
| 66 | + sizeof(PeSection) * max(coff.NumberOfSections, args.minimum_sections), |
| 67 | FILE_ALIGNMENT, |
| 68 | -- |
| 69 | 2.34.1 |
| 70 | |