Skip to content

[nrf noup] bootutil: Sanitize image_id in swap state - #750

Merged
tomchy merged 2 commits into
nrfconnect:mainfrom
tomchy:bugfix/bootutil/NCSDK-41309_Sanitize_image_id
Sep 16, 2026
Merged

tomchy merged 2 commits into
nrfconnect:mainfrom
tomchy:bugfix/bootutil/NCSDK-41309_Sanitize_image_id

Conversation

@tomchy

@tomchy tomchy commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

Check if the image_id passed to the boot_swap_type_multi(..) is valid.

Ref: NCSDK-41309

Check if the image_id passed to the boot_swap_type_multi(..) is valid.

Ref: NCSDK-41309

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
@tomchy
tomchy requested a review from a team September 15, 2026 12:49
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Sep 15, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-mcuboot#750

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
Add an assertion and a fallback logic if some code uses the
FLASH_AREA_IMAGE_PRIMARY(..) or FLASH_AREA_IMAGE_SECONDARY(..) without
sanitizing the input parameter.

Ref: NCSDK-41309

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
@tomchy
tomchy force-pushed the bugfix/bootutil/NCSDK-41309_Sanitize_image_id branch from cbe6021 to 4274113 Compare September 15, 2026 13:00
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Sep 15, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-mcuboot#750

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
@sonarqubecloud

Copy link
Copy Markdown

@kszromek-nordic
kszromek-nordic requested a lite review from Copilot September 15, 2026 15:20
@kszromek-nordic
kszromek-nordic requested review from a team and removed request for Copilot September 15, 2026 15:21
@tomchy
tomchy merged commit 8c46ed8 into nrfconnect:main Sep 16, 2026
5 checks passed
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Sep 16, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-mcuboot#750

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
tomchy pushed a commit to nrfconnect/sdk-nrf that referenced this pull request Sep 16, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-mcuboot#750

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants