[U-Boot] [PATCH 13/14] mkimage: Don't close the file if it wasn't opened

Simon Glass sjg at chromium.org
Wed Mar 16 14:45:43 CET 2016


The error path for fit_import_data() is incorrect if the second open() call
fails.

Reported-by: Coverity (CID: 138489)
Signed-off-by: Simon Glass <sjg at chromium.org>
---

 tools/fit_image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/fit_image.c b/tools/fit_image.c
index 6e5c143..ddefa72 100644
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
@@ -537,8 +537,8 @@ static int fit_import_data(struct image_tool_params *params, const char *fname)
 	if (fd < 0) {
 		fprintf(stderr, "%s: Can't open %s: %s\n",
 			params->cmdname, fname, strerror(errno));
-		ret = -EIO;
-		goto err;
+		free(fdt);
+		return -EIO;
 	}
 	if (write(fd, fdt, new_size) != new_size) {
 		debug("%s: Failed to write external data to file %s\n",
-- 
2.7.0.rc3.207.g0ac5344



More information about the U-Boot mailing list