fix(headless): reassemble DTBS ELF without sectools under --allow_unsigned#6
Open
xueqnie wants to merge 1 commit into
Open
fix(headless): reassemble DTBS ELF without sectools under --allow_unsigned#6xueqnie wants to merge 1 commit into
xueqnie wants to merge 1 commit into
Conversation
…igned QDTE's v2 reassembly path (used for uefi_dtbs.elf and other DTBS-style config ELFs) shells out to the external sectools binary to wrap the DTBS payload back into an ELF. On a minimal Yocto sysroot -- the headless --nogui / --allow_unsigned flow that downstream image builds rely on -- sectools is not present. When --sectools_dir is not supplied, gf['sectoolsDir'] is None and reassemble_config_elf() crashes before reassembly starts (TypeError: ... not NoneType), so uefi_dtbs.elf can never be reassembled in an unsigned build. Under --allow_unsigned the sectools call does no signing -- it only packs the (already page-aligned) DTBS data into a single PT_LOAD ELF at the original entry/load address. Reproduce that natively using the ELF header / program header packers already bundled in XBLConfig/elf_gen_tools.py, and fall back to it whenever a usable sectools path is not available. The signed path is unchanged. Also initialise sectool_path and guard the gf['sectoolsDir'] join. Verified against a real Hamoa uefi_dtbs.elf: qdte --nogui --modify injects QcCapsuleRootCert into both cert-bearing DTBs and reassembles a valid ELF (entry/class/alignment preserved, DTBs intact, certs confirmed via pyfdt) with no sectools on PATH. Signed-off-by: Xueqian Nie <xueqian.nie@oss.qualcomm.com>
|
Nice, we can also drop dependency on secboot in CI workflow introduced in #5 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
qdte --nogui --allow_unsigned can't reassemble uefi_dtbs.elf because the v2/DTBS reassembly path hard-requires the external sectools binary. In headless/CI/Yocto environments sectools isn't present, so gf['sectoolsDir'] is None and reassembly crashes with a TypeError before it starts — the DTBs get edited but the ELF is never regenerated.
Under --allow_unsigned, sectools does no signing anyway; it just packs the DTBS blob into a single PT_LOAD ELF. This adds a native fallback: if sectools is available use it (signed path unchanged), otherwise reassemble natively using the packers already bundled in XBLConfig/elf_gen_tools.py, preserving entry/vaddr/paddr/alignment.
Complements #5. Tested against a real Hamoa uefi_dtbs.elf and end-to-end capsule apply on hardware (qualcomm-linux/meta-qcom#2456).