Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomchy merged 2 commits into from
Sep 16, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bbad15
[nrf noup] bootutil: Sanitize image_id in swap state
tomchy Sep 15, 2026
4274113
[nrf noup] flash_map: Avoid overflows in flash_area
tomchy Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions boot/bootutil/src/bootutil_public.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,10 @@ boot_swap_type_multi(int image_index)
int rc;
size_t i;

if (image_index >= BOOT_IMAGE_NUMBER) {
return BOOT_SWAP_TYPE_PANIC;
}

if (FLASH_AREA_IMAGE_PRIMARY(image_index) ==
FLASH_AREA_IMAGE_SECONDARY(image_index)) {
BOOT_LOG_INF("Image index: %d, aliased slots; Swap type: none", image_index);
Expand Down
11 changes: 11 additions & 0 deletions boot/zephyr/include/sysflash/sysflash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <zephyr/devicetree.h>
#include <zephyr/storage/flash_map.h>
#include <zephyr/sys/util_macro.h>
#include <assert.h>

#ifndef SOC_FLASH_0_ID
#define SOC_FLASH_0_ID 0
Expand Down Expand Up @@ -163,6 +164,16 @@ static inline uint32_t __flash_area_ids_for_slot(int img, int slot)
SECOND_STAGE_INACTIVE_MCUBOOT_ID, PARTITION_ID(slot1_partition)
#endif
};
#ifdef CONFIG_ASSERT
assert(img * 2 + slot < ARRAY_SIZE(all_slots));
#else
/* Since there is no way to indicate a misuse of this function,
* return the first partition to avoid undefined behavior.
*/
if (img * 2 + slot >= ARRAY_SIZE(all_slots)) {
return all_slots[0];
}
#endif
return all_slots[img * 2 + slot];
};

Expand Down
Loading