Backport 25984 ([rom] Examine the immutable section and skip if invalid) #28798
+157
−26
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
pamaury
requested review from
engdoreis,
jwnrt and
timothytrippel
and removed request for
a team
pamaury
force-pushed
the
backport_25984
branch
3 times, most recently
from
6888d95 to
d0aef9f
Compare
jwnrt
approved these changes
Nov 21, 2025
Contributor
jwnrt
left a comment
jwnrt
left a comment
There was a problem hiding this comment.
Approving the backport but have some concerns about the use of kHardenedBoolFalse in a pointer.
| static rom_error_t rom_verify_immutable_section( | ||
| rom_error_t verify_result, const manifest_t *manifest, | ||
| uintptr_t *imm_section_entry_point) { | ||
| *imm_section_entry_point = kHardenedBoolFalse; |
Contributor
There was a problem hiding this comment.
I'm not entirely comfortable with using a sentinal value in the middle of a pointer, although I don't think that the current value of kHardenedBoolFalse is a valid address.
I would prefer to have a separate valid boolean outside of the address if possible.
Add tests that check if a valid signed ROM_EXT with an invalid immutable section can boot. The correct behavior is that the ROM should determine that the immutable section is invalid and try the other slot. Signed-off-by: Chris Frantz <[email protected]> (cherry picked from commit f17d30f)
1. Refactor immutable section verification into a separate function. 2. When booting, examine the immutable section and fail the boot with an error if the immutable section is invalid. If the failure occurs in the primary slot, the ROM should attempt to boot the secondary slot. Signed-off-by: Chris Frantz <[email protected]> (cherry picked from commit 1561505)
pamaury
force-pushed
the
backport_25984
branch
from
d0aef9f to
23e236d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Backport #25984.
Note: several conflicts due to the fact that #26427 was applied after #25984 on earlgrey_1.0.0 but backported to master in #27133 already