OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

boot: Fix swap-move algorithm failing to validate multi-image 

In multi image swap validation of images could fail due to
headers being incorrectly re-read from storage.

Fixes #1768

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2024-02-01 11:59:24 +00:00 committed by Dominik Ermel
parent 4b4cc85c67
commit 6f7f87384d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot/bootutil/src/loader.c
View File

@ -4,6 +4,7 @@
* Copyright (c) 2016-2020 Linaro LTD * Copyright (c) 2016-2020 Linaro LTD
* Copyright (c) 2016-2019 JUUL Labs * Copyright (c) 2016-2019 JUUL Labs
* Copyright (c) 2019-2023 Arm Limited * Copyright (c) 2019-2023 Arm Limited
* Copyright (c) 2024 Nordic Semiconductor ASA
* *
* Original license: * Original license:
* *
@ -2211,8 +2212,13 @@ context_boot_go(struct boot_loader_state *state, struct boot_rsp *rsp)
if (BOOT_SWAP_TYPE(state) != BOOT_SWAP_TYPE_NONE) { if (BOOT_SWAP_TYPE(state) != BOOT_SWAP_TYPE_NONE) {
/* Attempt to read an image header from each slot. Ensure that image /* Attempt to read an image header from each slot. Ensure that image
* headers in slots are aligned with headers in boot_data. * headers in slots are aligned with headers in boot_data.
* Note: Quite complicated internal logic of boot_read_image_headers
* uses boot state, the last parm, to figure out in which slot which
* header is located; when boot state is not provided, then it
* is assumed that headers are at proper slots (we are not in
* the middle of moving images, etc).
*/ */
rc = boot_read_image_headers(state, false, &bs); rc = boot_read_image_headers(state, false, NULL);
if (rc != 0) { if (rc != 0) {
FIH_SET(fih_rc, FIH_FAILURE); FIH_SET(fih_rc, FIH_FAILURE);
goto out; goto out;