dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

mkimage: Fix error path in fit_extract_data()

Browse Source 
The 'fdt' variable is not unmapped in all error cases. Fix this.

Reported-by: Coverity (CID: 138493)

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass
2016-03-16 07:45:39 -06:00
committed by Tom Rini
parent 6e0ffce6cb
commit b97d71e26a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/fit_image.c
View File

@@ -385,7 +385,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname)
buf = malloc(fit_size); buf = malloc(fit_size);
if (!buf) { if (!buf) {
ret = -ENOMEM; ret = -ENOMEM;
goto err; goto err_munmap;
} }
buf_ptr = 0; buf_ptr = 0;
@@ -393,7 +393,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname)
if (images < 0) { if (images < 0) {
debug("%s: Cannot find /images node: %d\n", __func__, images); debug("%s: Cannot find /images node: %d\n", __func__, images);
ret = -EINVAL; ret = -EINVAL;
goto err; goto err_munmap;
} }
for (node = fdt_first_subnode(fdt, images); for (node = fdt_first_subnode(fdt, images);
@@ -411,7 +411,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname)
ret = fdt_delprop(fdt, node, "data"); ret = fdt_delprop(fdt, node, "data");
if (ret) { if (ret) {
ret = -EPERM; ret = -EPERM;
goto err; goto err_munmap;
} }
fdt_setprop_u32(fdt, node, "data-offset", buf_ptr); fdt_setprop_u32(fdt, node, "data-offset", buf_ptr);
fdt_setprop_u32(fdt, node, "data-size", len); fdt_setprop_u32(fdt, node, "data-size", len);
@@ -446,8 +446,11 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname)
ret = -EIO; ret = -EIO;
goto err; goto err;
} }
ret = 0; close(fd);
return 0;
err_munmap:
munmap(fdt, sbuf.st_size);
err: err:
close(fd); close(fd);
return ret; return ret;