Skip to content

ComposeFS fixes for missing verity#2085

Merged
cgwalters merged 2 commits intobootc-dev:mainfrom
Johan-Liebert1:uki-insecure-fix
Mar 23, 2026
Merged

ComposeFS fixes for missing verity#2085
cgwalters merged 2 commits intobootc-dev:mainfrom
Johan-Liebert1:uki-insecure-fix

Conversation

@Johan-Liebert1
Copy link
Collaborator

composefs: Use ComposefsCmdline to handle missing verity

In a few places we were simply searching for the value of composefs
cmdline param in the BLS config options, which would not work as
expected in cases where missing verity is allowed as the ? was being
counted as part of the digest.

Instead, we now use ComposefsCmdline which properly handles the parsing
of ? and the digest


composefs: Build composefs cmdline

Instead of writing format strings to create a composefs= parameter in
the cmdline, add a build method to ComposefsCmdline to build a cmdline
from options

In a few places we were simply searching for the value of composefs
cmdline param in the BLS config options, which would not work as
expected in cases where missing verity is allowed as the `?` was being
counted as part of the digest.

Instead, we now use ComposefsCmdline which properly handles the parsing
of `?` and the digest

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
@bootc-bot bootc-bot bot requested a review from jmarrero March 23, 2026 06:27
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request is a solid refactoring that centralizes the logic for handling the composefs kernel command-line parameter. By introducing ComposefsCmdline::build and implementing Display for ComposefsCmdline, you've eliminated manual string formatting and created a single source of truth for constructing this parameter. This not only improves code clarity and maintainability but also fixes a subtle bug where the optional ? prefix for missing verity was being incorrectly handled in some parts of the code. The changes are applied consistently across the codebase. I have one minor suggestion for improvement.

Instead of writing format strings to create a composefs= parameter in
the cmdline, add a build method to ComposefsCmdline to build a cmdline
from options

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
@cgwalters cgwalters merged commit 42e2db3 into bootc-dev:main Mar 23, 2026
95 of 103 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants