[nrf noup] boot: bootutil: loader: Fix triple erasing s0/s1 update

nrf-squash! [nrf noup] treewide: Add support for sysbuild assigned images

Fixes an issue whereby if an invalid s0/s1 slot update was loaded,
then the slot would be erased 3 times instead of just once

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

Author: nordicjm

boot/bootutil/src/loader.c

@@ -1401,6 +1401,18 @@ boot_update_security_counter(uint8_t image_index, int slot,
 
 static uint8_t sec_slot_assignment[MCUBOOT_IMAGE_NUMBER] = {0};
 
+#if CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1
+static inline void sec_slot_untouch(struct boot_loader_state *state)
+{
+    sec_slot_assignment[CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER] = SEC_SLOT_VIRGIN;
+    sec_slot_assignment[CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER] = SEC_SLOT_VIRGIN;
+}
+#else
+static inline void sec_slot_untouch(struct boot_loader_state *state)
+{
+}
+#endif
+
 static inline void sec_slot_touch(struct boot_loader_state *state)
 {
 #if CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1
@@ -1467,6 +1479,9 @@ static void sec_slot_cleanup_if_unusable(void)
     }
 }
 #else
+static inline void sec_slot_untouch(struct boot_loader_state *state)
+{
+}
 static inline void sec_slot_touch(struct boot_loader_state *state)
 {
 }
@@ -1557,6 +1572,8 @@ boot_validated_swap_type(struct boot_loader_state *state,
                 /* NSIB upgrade but for the wrong slot, must be erased */
                 BOOT_LOG_ERR("Image in slot is for wrong s0/s1 image");
                 flash_area_erase(secondary_fa, 0, secondary_fa->fa_size);
+                sec_slot_untouch(state);
+                BOOT_LOG_ERR("Cleaned-up secondary slot of image %d", BOOT_CURR_IMG(state));
                 return BOOT_SWAP_TYPE_FAIL;
             } else if (reset_addr < primary_fa->fa_off || reset_addr > (primary_fa->fa_off + primary_fa->fa_size)) {
                 /* The image in the secondary slot is not intended for any */