plat-rockchip: rk3588: assert buffer is size of HUK #7564
+3
−0
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
The size of the buffer that is used to persist the HUK in the OTP and the size of the buffer that is used to read the HUK from the OTP must have the same size as the HUK key data. Add a static_assert to ensure that this is actually the case. Signed-off-by: Michael Tretter <[email protected]>
etienne-lms
reviewed
Oct 24, 2025
| { | ||
| TEE_Result res = TEE_SUCCESS; | ||
| uint32_t buffer[ROCKCHIP_OTP_HUK_SIZE] = { }; | ||
| static_assert(sizeof(buffer) == sizeof(hwkey->data)); |
There was a problem hiding this comment.
This needs an empty line above to separate from variable definitions.
Suggestion:
TEE_Result res = TEE_SUCCESS;
uint32_t buffer[ROCKCHIP_OTP_HUK_SIZE] = { };
static_assert(sizeof(buffer) == sizeof(hwkey->data));
memcpy(buffer, hwkey->data, HW_UNIQUE_KEY_LENGTH);There was a problem hiding this comment.
Initially, I was putting the static_assert next to the memcpy, too. In this case, the compiler is warning about mixing declarations and code. (In this instance, the compiler is not warning, because the static_assert is still above the code, but in read_huk it's not.) I didn't look deeper into the macro expansion, but it seems that static_assert somehow expands to a declaration.
Should I ignore the compiler warning?
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.
The size of the buffer that is used to persist the HUK in the OTP and the size of the buffer that is used to read the HUK from the OTP must have the same size as the HUK key data.
Add a static_assert to ensure that this is actually the case.
Suggested by @etienne-lms in #7545 (comment).