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

bootutil: loader: Add state to boot_is_header_valid() function 

Adds the state object to this function so it can be referenced

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2024-08-22 10:43:14 +01:00 committed by Jamie
parent 6071ceb1d0
commit dbb5c782fb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -863,10 +863,13 @@ out:
* within the flash area we are in.
*/
static bool
boot_is_header_valid(const struct image_header *hdr, const struct flash_area *fap)
boot_is_header_valid(const struct image_header *hdr, const struct flash_area *fap,
struct boot_loader_state *state)
{
uint32_t size;
(void)state;
if (hdr->ih_magic != IMAGE_MAGIC) {
return false;
}
@ -1033,7 +1036,7 @@ boot_validate_slot(struct boot_loader_state *state, int slot,
{
FIH_CALL(boot_image_check, fih_rc, state, hdr, fap, bs);
}
if (!boot_is_header_valid(hdr, fap) || FIH_NOT_EQ(fih_rc, FIH_SUCCESS)) {
if (!boot_is_header_valid(hdr, fap, state) || FIH_NOT_EQ(fih_rc, FIH_SUCCESS)) {
if ((slot != BOOT_PRIMARY_SLOT) || ARE_SLOTS_EQUIVALENT()) {
flash_area_erase(fap, 0, flash_area_get_size(fap));
/* Image is invalid, erase it to prevent further unnecessary
@ -2556,7 +2559,7 @@ boot_get_slot_usage(struct boot_loader_state *state)
for (slot = 0; slot < BOOT_NUM_SLOTS; slot++) {
hdr = boot_img_hdr(state, slot);
if (boot_is_header_valid(hdr, BOOT_IMG_AREA(state, slot))) {
if (boot_is_header_valid(hdr, BOOT_IMG_AREA(state, slot), state)) {
state->slot_usage[BOOT_CURR_IMG(state)].slot_available[slot] = true;
BOOT_LOG_IMAGE_INFO(slot, hdr);
} else {