commit dbb5c782fbfd1dc13f9c273cbcf6935128b44e7a
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Thu Aug 22 10:43:14 2024 +0100
committer Jamie <40387179+nordicjm@users.noreply.github.com> Tue Aug 27 12:51:27 2024 +0100
tree bd2155799b492838bc1ce0eb766e2029e191b361
parent 6071ceb1d0d955b6ff4745499a0ff3ac7d79f24b

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>

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 8663fbf..491c83c 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -863,10 +863,13 @@
  * 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 @@
     {
         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 @@
         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 {