From: Quentin Schulz <quentin.schulz@cherry.de>
Date: Tue, 23 Sep 2025 10:27:20 +0000 (+0200)
Subject: mkimage: fit: do not overwrite fdt_setprop return value
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6209ce58c3711a5ccdcd080651e604ba8fd3a067;p=thirdparty%2Fu-boot.git

mkimage: fit: do not overwrite fdt_setprop return value

The return code of fdt_setprop is overwritten by the one from
fdt_delprop meaning we could very well have an issue when setting the
property that would be ignored if the deletion of the property that
comes right after passes.

Let's add a separate check for each.

Fixes: 4860ee9b09e0 ("mkimage: allow internalization of data-position")
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---

diff --git a/tools/fit_image.c b/tools/fit_image.c
index 10849733816..7e2a12aa7d0 100644
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
@@ -793,14 +793,20 @@ static int fit_import_data(struct image_tool_params *params, const char *fname)
 		debug("Importing data size %x\n", len);
 
 		ret = fdt_setprop(fdt, node, FIT_DATA_PROP, data, len);
-		ret = fdt_delprop(fdt, node, ext_data_prop);
-
 		if (ret) {
 			debug("%s: Failed to write property: %s\n", __func__,
 			      fdt_strerror(ret));
 			ret = -EINVAL;
 			goto err_munmap;
 		}
+
+		ret = fdt_delprop(fdt, node, ext_data_prop);
+		if (ret) {
+			debug("%s: Failed to erase property: %s\n", __func__,
+			      fdt_strerror(ret));
+			ret = -EINVAL;
+			goto err_munmap;
+		}
 	}
 
 	confs = fdt_path_offset(fdt, FIT_CONFS_PATH);