Fix possible array index overflow in loader.c: fill_rsp()

DOAR-Infineon · d3zd3z · commit 94360d5b2fb8 · 2023-02-28T08:08:35.000-07:00
Signed-off-by: INFINEON\DovhalA &lt;Artem.Dovhal@infineon.com&gt;
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
@@ -182,6 +182,10 @@ fill_rsp(struct boot_loader_state *state, struct boot_rsp *rsp)
             break;
         }
     }
+    /* At least one image must be active, otherwise skip the execution */
+    if (BOOT_CURR_IMG(state) >= BOOT_IMAGE_NUMBER) {
+        return;
+    }
 #endif
 
 #if defined(MCUBOOT_DIRECT_XIP) || defined(MCUBOOT_RAM_LOAD)

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,10 @@ fill_rsp(struct boot_loader_state state, struct boot_rsp rsp)`
`182`	`182`	`break;`
`183`	`183`	`}`
`184`	`184`	`}`
	`185`	`+ /* At least one image must be active, otherwise skip the execution */`
	`186`	`+ if (BOOT_CURR_IMG(state) >= BOOT_IMAGE_NUMBER) {`
	`187`	`+ return;`
	`188`	`+ }`
`185`	`189`	`#endif`
`186`	`190`
`187`	`191`	`#if defined(MCUBOOT_DIRECT_XIP) \|\| defined(MCUBOOT_RAM_LOAD)`