bootutil: Fixed security counter overflow detected to late #2420
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
ahasztag
requested review from
nordicjm,
de-nordic and
davidvincze
as code owners
ahasztag
force-pushed
the
fix_security_counter_update_oob
branch
from
7b100f8 to
cad5f2b
Compare
nordicjm
requested changes
Aug 11, 2025
boot/bootutil/src/image_validate.c
Outdated
| @@ -437,6 +437,18 @@ bootutil_img_validate(struct boot_loader_state *state, | |||
| goto out; | |||
| } | |||
|
|
|||
| #if MCUBOOT_HW_ROLLBACK_PROT_COUNTER_LIMITED | |||
There was a problem hiding this comment.
Suggested change
| #if MCUBOOT_HW_ROLLBACK_PROT_COUNTER_LIMITED | |
| #ifdef MCUBOOT_HW_ROLLBACK_PROT_COUNTER_LIMITED |
ahasztag
force-pushed
the
fix_security_counter_update_oob
branch
from
cad5f2b to
ecc51f2
Compare
nordicjm
reviewed
Aug 11, 2025
| * | ||
| * @return FIH_SUCCESS if update is possible; FIH_FAILURE otherwise | ||
| */ | ||
| fih_ret boot_nv_security_counter_is_update_possible(void); |
There was a problem hiding this comment.
(from the previous comment) this should have the image id I think because there might be multiple counters with different limits
There was a problem hiding this comment.
Ok, done; I also added img_security_cnt, the new security counter value - in case the security counter was not only limited by the number of updates, but also by the value of the counter itself (which is a situation described in the psa boot guide)
ahasztag
force-pushed
the
fix_security_counter_update_oob
branch
2 times, most recently
from
f8e13fb to
0f742d1
Compare
This commit fixes the issue, occuring when the maximum amount of security counter updates has been reached. This fact was only detected after a permament update already happened - the updated firmware was unable to boot, as it failed when trying to update the security counter after the permament swap. This commit adds the check if the security counter can be updated (i. e. free security counter slots are still available) before the swap is performed, fixing the issue. Signed-off-by: Artur Hadasz <artur.hadasz@nordicsemi.no>
ahasztag
force-pushed
the
fix_security_counter_update_oob
branch
from
0f742d1 to
2eb2959
Compare
nordicjm
approved these changes
Aug 14, 2025
de-nordic
approved these changes
Aug 14, 2025
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.
This commit fixes the issue, occuring when the maximum amount of security counter updates has been reached.
This fact was only detected after a permament update already happened - the updated firmware was unable to boot, as it failed when trying to update the security counter after the permament swap.
This commit adds the check if the security counter can be updated (i. e. free security counter slots are still available) before the swap is performed, fixing the issue.