ukify: Validate that there are no overlapping sections

Let's make sure that after calling objcopy we have no overlapping
sections in the UKI

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 63e7202d3dafb854ec16d15c854a62a01f604e70..8f8537b30ea37ecd9d360aa03bc6e5c2e1edd827 100755 (executable)
--- 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: