dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-09 01:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

ukify: Calculate section size more correctly (#36215)

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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-02-03 10:17:37 +01:00
committed by GitHub
parent d35f7966ba 33b25fa11c
commit 2e326aad7f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ukify/ukify.py
View File

@@ -740,6 +740,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',
@@ -1364,16 +1368,16 @@ 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)
)
if opts.sign_profiles:
pesection = next(s for s in pe.sections if pe_strip_section_name(s.Name) == '.profile')
id = read_env_file(pesection.get_data(length=pesection.Misc_VirtualSize).decode()).get('ID')
id = read_env_file(pesection.get_data(length=pe_section_size(pesection)).decode()).get('ID')
if not id or id not in opts.sign_profiles:
print(f'Not signing expected PCR measurements for "{id}" profile')
continue
@@ -1555,12 +1559,11 @@ 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()
struct = {
struct: dict[str, Union[int, str]] = {
'size': size,
'sha256': digest,
}
@@ -1579,7 +1582,7 @@ def inspect_section(
if opts.json == 'off':
print(f'{name}:\n size: {size} bytes\n sha256: {digest}')
if ttype == 'text':
text = textwrap.indent(struct['text'].rstrip(), ' ' * 4)
text = textwrap.indent(cast(str, struct['text']).rstrip(), ' ' * 4)
print(f' text:\n{text}')
return name, struct