From 3fc1ae89e756d1624f5135aec5510a939ed01317 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 21 Dec 2022 15:18:13 +0100 Subject: [PATCH] ukify: Validate that there are no overlapping sections Let's make sure that after calling objcopy we have no overlapping sections in the UKI --- src/ukify/ukify.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py index 63e7202d3da..8f8537b30ea 100755 --- a/src/ukify/ukify.py +++ b/src/ukify/ukify.py @@ -424,6 +424,18 @@ def join_initrds(initrds): assert False +def pe_validate(filename): + import pefile + + pe = pefile.PE(filename) + + sections = sorted(pe.sections, key=lambda s: (s.VirtualAddress, s.Misc_VirtualSize)) + + for l, r in itertools.pairwise(sections): + if l.VirtualAddress + l.Misc_VirtualSize > r.VirtualAddress + r.Misc_VirtualSize: + raise ValueError(f'Section "{l.Name.decode()}" ({l.VirtualAddress}, {l.Misc_VirtualSize}) overlaps with section "{r.Name.decode()}" ({r.VirtualAddress}, {r.Misc_VirtualSize})') + + def make_uki(opts): # kernel payload signing @@ -540,6 +552,8 @@ def make_uki(opts): print('+', shell_join(cmd)) subprocess.check_call(cmd) + pe_validate(output) + # UKI signing if opts.sb_key: -- 2.47.3