tpm2: Return InvalidRoleParams error for invalid PCR policies #494
Conversation
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
This makes the tpm2 platform return the PlatformHandlerErrorInvalidRoleParams error type when a PCR policy is invalid, so that the KeyData API returns the appropriate InvalidKeyDataRoleParamsError and the ActivateState contains the new invalid-role-params keyslot error enum. The existing PlatformHandlerErrorIncompatibleRole is only returned in the case where the PCR policy is not authorized for the current configuration, but is otherwise valid. Fixes: FR-12368
chrisccoulson
force-pushed
the
tpm2-support-invalid-role-params-error
branch
from
cf90789 to
56cf0a2
Compare
pedronis
reviewed
Jan 23, 2026
| return nil, ErrTPMLockout | ||
| case tpm2.IsTPMSessionError(err, tpm2.ErrorPolicyFail, tpm2.CommandUnseal, 1): | ||
| return nil, &PCRPolicyDataError{errors.New("the authorization policy check failed during unsealing")} | ||
| return nil, InvalidKeyDataError{"the authorization policy check failed during unsealing"} |
Collaborator
There was a problem hiding this comment.
does the description in errors.go for PCRPolicyDataError or any of the other involved errors need to change now?
Collaborator
Author
There was a problem hiding this comment.
They don't as we're still returning the same errors. It's still returning PCRPolicyDataError in both the cases where the PCR policy metadata is valid but just needs updating and where the PCR policy metadata is actually invalid - the code in tpm2/platform.go distinguishes between the 2 cases with a special error value that it wraps in the first case (errPcrPolicyNotAuthorized). InvalidKeyDataError still has the same meaning - the change here is because this specific error condition won't be corrected by recreating the PCR policy during repair.
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.
This makes the tpm2 platform return the
PlatformHandlerErrorInvalidRoleParamserror type when a PCR policy isinvalid, so that the
KeyDataAPI returns the appropriateInvalidKeyDataRoleParamsErrorand theActivateStatecontains the newinvalid-role-paramskeyslot error enum. The existingPlatformHandlerErrorIncompatibleRoleis only returned in the case wherethe PCR policy is not authorized for the current configuration, but is
otherwise valid.
Fixes: FR-12368