Fix for handles not being unique. #388
Merged
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
Member
|
Will need to port this to v7 as well. I can open another PR after I merge the current one. |
Superhepper
force-pushed
the
non-unique-handles
branch
from
6a5bd7a to
17fe38e
Compare
Superhepper
force-pushed
the
non-unique-handles
branch
3 times, most recently
from
f7b5a6c to
8cf029d
Compare
|
This should be already merged in #390? Safe to close? |
Member
Depends on whether @Superhepper prefers getting rid of the |
Collaborator
Author
|
This basically the same thing this is just to master. |
wiktor-k
approved these changes
Feb 2, 2023
| error!("Handle({}) is already open", ESYS_TR::from(handle)); | ||
| return Err(Error::local_error(WrapperErrorKind::InvalidHandleState)); | ||
| // It is safe to call unwrap because the existance of the key has already been verified. | ||
| let stored_handle_drop_action = self.open_handles.get(&handle).unwrap(); |
Collaborator
There was a problem hiding this comment.
It's possible to avoid the unwrap by using if let just like in the other PR.
I trust you'll adjust it and I don't want to unnecessarily block the workflow so I'll ack the PR now :)
- Handles returned from tpm2-tss APIs does not need to be unique. This an attempt to fix problem parallaxsecond#383 by removing the check in HandleManager that made a check for uniqueness. This has been replaced with handle consistency check. - Enables the integration tests that was disabled due to this issue. Co-authored-by: Ionut Mihalcea <ionut.mihalcea@arm.com> Co-authored-by: Jesper Brynolf <jesper.brynolf@gmail.com> Signed-off-by: Jesper Brynolf <jesper.brynolf@gmail.com>
Superhepper
force-pushed
the
non-unique-handles
branch
from
8cf029d to
4d08f5e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Handles returned from tpm2-tss APIs does not need to be unique. This an attempt to fix problem #383.
This problem was also discussed in tpm2-software/tpm2-tss#2537.
Signed-off-by: Jesper Brynolf jesper.brynolf@gmail.com