shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00
Code

ukify: Calculate section size more correctly

Browse Source 
We should only use Misc_VirtualSize if it's smaller than SizeOfRawData,
since in that case it'll be the non-aligned section size. Otherwise we
have to use SizeOfRawData to get the size on disk.

(cherry picked from commit 33b25fa11c408ae40f2aa4300220504329a23a52)
This commit is contained in:
Daan De Meyer 2025-01-29 14:44:27 +01:00 committed by Luca Boccassi
parent 47be0e801e
commit f01ba41cae
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ukify/ukify.py
View File

@ -710,6 +710,10 @@ def pe_strip_section_name(name: bytes) -> str:
return name.rstrip(b'\x00').decode()
def pe_section_size(section: pefile.SectionStructure) -> int:
return cast(int, min(section.Misc_VirtualSize, section.SizeOfRawData))
def call_systemd_measure(uki: UKI, opts: UkifyConfig, profile_start: int = 0) -> None:
measure_tool = find_tool(
'systemd-measure',
@ -1250,11 +1254,11 @@ def make_uki(opts: UkifyConfig) -> None:
continue
print(
f"Copying section '{n}' from '{profile}': {pesection.Misc_VirtualSize} bytes",
f"Copying section '{n}' from '{profile}': {pe_section_size(pesection)} bytes",
file=sys.stderr,
)
uki.add_section(
Section.create(n, pesection.get_data(length=pesection.Misc_VirtualSize), measure=True)
Section.create(n, pesection.get_data(length=pe_section_size(pesection)), measure=True)
)
call_systemd_measure(uki, opts=opts, profile_start=prev_len)
@ -1434,8 +1438,7 @@ def inspect_section(
ttype = config.output_mode if config else DEFAULT_SECTIONS_TO_SHOW.get(name, 'binary')
size = section.Misc_VirtualSize
# TODO: Use ignore_padding once we can depend on a newer version of pefile
size = pe_section_size(section)
data = section.get_data(length=size)
digest = sha256(data).hexdigest()