Skip to content

Fix error handling in fs-verity measurement#877

Merged
Luap99 merged 2 commits into
containers:mainfrom
mtrmac:fsverity
May 27, 2026
Merged

Fix error handling in fs-verity measurement#877
Luap99 merged 2 commits into
containers:mainfrom
mtrmac:fsverity

Conversation

@mtrmac
Copy link
Copy Markdown
Contributor

@mtrmac mtrmac commented May 27, 2026

Don’t ignore errors enabling it on a file, only to fail with a less informative ENODATA when measuring.

Warning: absolutely untested.

Cc: @giuseppe

@github-actions github-actions Bot added the storage Related to "storage" package label May 27, 2026
Copy link
Copy Markdown
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM, @alexlarsson PTAL

mtrmac added 2 commits May 27, 2026 19:17
Use a switch, we will add another case.
Explicitly check for DifferFsVerityIfAvailable ; it _should_
be the only possible value but take no chances.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
We proceed to MeasureVerity, which will fail anyway;
so actually report the right error.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Copy link
Copy Markdown
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

@Luap99 Luap99 merged commit bb257f9 into containers:main May 27, 2026
37 checks passed
@mtrmac mtrmac deleted the fsverity branch May 27, 2026 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

storage Related to "storage" package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants