[nrf noup] boot: bootutil: loader: Fix monotomic counter update issues #402
+95
−1
Conversation
This file contains 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
nvlsianpu
requested changes
Mar 11, 2025
boot/bootutil/src/loader.c
Outdated
|
|
||
| #if defined(CONFIG_SOC_NRF5340_CPUAPP) && CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1 | ||
| if (image_index == CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER) { | ||
| /* Downgrade prevention on network core image is managed by NSIB */ |
There was a problem hiding this comment.
Suggested change
| /* Downgrade prevention on network core image is managed by NSIB */ | |
| /* Downgrade prevention on network core image is not managed */ |
There was a problem hiding this comment.
It doesn't do hardware checks but it does do a software check, an older version cannot be loaded so the comment is correct but could be updated to say it's done in software, thoughts?
boot/bootutil/src/loader.c
Outdated
| @@ -2493,6 +2507,13 @@ check_downgrade_prevention(struct boot_loader_state *state) | |||
| } | |||
| #endif | |||
|
|
|||
| #if defined(CONFIG_SOC_NRF5340_CPUAPP) && CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1 | |||
| if (BOOT_CURR_IMG(state) == CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER) { | |||
| /* Downgrade prevention on network core image is managed by NSIB */ | |||
There was a problem hiding this comment.
Suggested change
| /* Downgrade prevention on network core image is managed by NSIB */ | |
| /* Downgrade prevention on network core image is not managed */ |
nrf-squash! [nrf noup] boot/../loader: skip downgrade prevention for s1/s0 Fixes 4 issues with monotomic counter usage: 1. Where the NSIB update skipped the check but would then wrongly update the monotomic counter after 2. Where a network core update on nRF5340 used the monotonic counter which only supports a single image 3. Where an NSIB update used the monotonic counter which only supports a single image 4. Where security counter validation was wrongly performed on other images against the main image security counter Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
nordicjm
force-pushed
the
fixhardwaremonotomiccountervalueupdatefornetworkcoreandnsibupdatesthatdoesnotworkonnrf5340
branch
from
209a8aa to
ac343a3
Compare
|
@nvlsianpu can you re-review? |
|
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.
nrf-squash! [nrf noup] boot/../loader: skip downgrade prevention for s1/s0
Fixes 2 issues with monotomic counter usage: