commit feb939c6c1178ccb5dc950098a6471791e929e6f
author Aristo Chen <jj251510319013@gmail.com> Tue Jun 10 07:41:18 2025 +0000
committer Tom Rini <trini@konsulko.com> Thu Jun 26 08:12:54 2025 -0600
tree 371ed35d6845ce99fb1007a3dda0bbdb4ffae815
parent 48f5c27716a1a22e3d17bcb2f3f7cbdbe2e1c20b

tools: mkimage: validate image references in FIT configurations

When parsing a FIT image source (ITS), mkimage does not currently check
whether the image names referenced in the /configurations section (e.g.
"kernel", "fdt", "ramdisk", "loadables") actually exist in the /images
node.

This patch introduces a validation step during FIT import that iterates
over each configuration and verifies that all referenced image names are
defined under /images. If a missing image is detected, an appropriate
error is reported and mkimage exits with FDT_ERR_NOTFOUND.

This ensures that configuration integrity is validated at build time.

Signed-off-by: Aristo Chen <aristo.chen@canonical.com>

tools/mkimage.c

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 2954626..361711c 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -519,8 +519,13 @@
 			 */
 			retval = tparams->fflag_handle(&params);
 
-		if (retval != EXIT_SUCCESS)
+		if (retval != EXIT_SUCCESS) {
+			if (retval == FDT_ERR_NOTFOUND) {
+				// Already printed error, exit cleanly
+				exit(EXIT_FAILURE);
+			}
 			usage("Bad parameters for FIT image type");
+		}
 	}
 
 	if (params.lflag || params.fflag) {