Repository navigation
optee-utee: fix TEE_OperationInfoMultiple ABI and ownership - #338
Merged
Merged
Conversation
The C struct ends with a flexible array member of TEE_OperationInfoKey. Model it as a zero-length array instead of a pointer. The pointer made the Rust struct 40 bytes on 64-bit targets while the C sizeof is 32, and keyInformation was treated as a pointer rather than the key data that immediately follows the fixed header.
The old wrapper passed a zero size and a const pointer to TEE_GetOperationInfoMultiple, so the call could not succeed and the returned pointer could dangle. Return an owned value instead and validate the reported key count.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
TEE_OperationInfoMultipleto match the C flexible array member and makeOperationInfoMultipleown its C-layout buffer instead of returning a dangling pointer.info_multiple(&mut [u8])signature and validate the buffer and reported key count before copying.