fix(bootutil): correct copy size when bootstrapping and swapping with… #2553
+23
−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
TomLier
force-pushed
the
bugfix/incorrect_copy_size_when_bootstrapping_and_swap_using_move
branch
from
dbe1aa6 to
2cd598b
Compare
nordicjm
approved these changes
Nov 21, 2025
nordicjm
reviewed
Nov 21, 2025
boot/bootutil/src/loader.c
Outdated
| } | ||
|
|
||
| #if defined(MCUBOOT_SWAP_USING_MOVE) | ||
| /* When using MCUBOOT_SWAP_USING_MOVE, primary region is larger then the secondary region |
Collaborator
There was a problem hiding this comment.
adjust commit title to: boot: bootutil: loader: Fix bootstrap copying in swap move mode
Collaborator
|
and fix commit sign off for CI |
TomLier
force-pushed
the
bugfix/incorrect_copy_size_when_bootstrapping_and_swap_using_move
branch
from
2cd598b to
1b3ed63
Compare
de-nordic
approved these changes
Dec 11, 2025
d3zd3z
force-pushed
the
bugfix/incorrect_copy_size_when_bootstrapping_and_swap_using_move
branch
from
1b3ed63 to
a77cba9
Compare
nordicjm
force-pushed
the
bugfix/incorrect_copy_size_when_bootstrapping_and_swap_using_move
branch
from
a77cba9 to
70e243b
Compare
Collaborator
|
@TomLier we rebased to fix a CI change and fixed an incorrect define being used in an attempt to get this into the 2.3 release but it seems your changes break CI due to writing to an unerased page on https://github.com/mcu-tools/mcuboot/actions/runs/20139212331/job/57801476343?pr=2553 can you take a look at fix? |
Previously, the copy size was calculated using the primary region size, which could be larger than the secondary region. This fix ensures that the size of the secondary region (excluding the swap sector) is used, preventing over-copying and related issues during image upgrade or bootstrap operations. Signed-off-by: LIERMAN Tom <[email protected]> Signed-off-by: David Brown <[email protected]> Signed-off-by: Jamie McCrae <[email protected]>
TomLier
force-pushed
the
bugfix/incorrect_copy_size_when_bootstrapping_and_swap_using_move
branch
from
70e243b to
6ab6adb
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.
… MOVE
Previously, the copy size was calculated using the primary region size, which could be larger than the secondary region. This fix ensures that the size of the secondary region (excluding the swap sector) is used, preventing over-copying and related issues during image upgrade or bootstrap operations.