Skip to content

efi/preinstall: relax checkSecureBootPolicyForDegradedFirmwareSettings#526

Merged
chrisccoulson merged 1 commit intocanonical:masterfrom
chrisccoulson:fr-12830
Mar 10, 2026
Merged

efi/preinstall: relax checkSecureBootPolicyForDegradedFirmwareSettings#526
chrisccoulson merged 1 commit intocanonical:masterfrom
chrisccoulson:fr-12830

Conversation

@chrisccoulson
Copy link
Collaborator

This function shouldn't fail on unexpected event types. Instead, the
unexpected event types should trigger errors later on, resulting in more
appropriate error messages.

Fixes: FR-12830
Fixes: #514

This function shouldn't fail on unexpected event types. Instead, the
unexpected event types should trigger errors later on, resulting in more
appropriate error messages.

Fixes: FR-12830
Fixes: canonical#514
@chrisccoulson chrisccoulson requested a review from pedronis March 9, 2026 22:45
Copy link
Collaborator

@pedronis pedronis left a comment

Choose a reason for hiding this comment

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

test question

c.Check(err, ErrorMatches, `unexpected EV_EFI_ACTION event data in PCR7 event: \"Calling EFI Application from Boot Option\"`)
}

func (s *hostSecuritySuite) TestCheckSecureBootPolicyPCRForDegradedSettingsErrUnexpectedType(c *C) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

do we have an equivalent test for the higher level?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, there are tests in check_pcr7_test.go that check unexpected event types are caught.

Copy link
Collaborator

@pedronis pedronis left a comment

Choose a reason for hiding this comment

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

+1

@chrisccoulson chrisccoulson merged commit 30faaae into canonical:master Mar 10, 2026
2 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.

checkSecureBootPolicyForDegradedFirmwareSettings shouldn't fail on unexpected event types

2 participants