leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/fit_image.c: Update some return code paths

Browse Source 
Coverity has found some problems with the return paths in parts of this
code.  We have a case where we were going to the wrong part of the
unwind (open() failed so we cannot close the fd), a case where we were
only free()ing our buf on the error path and finally a case where we did
not munmap in the failure path.

Reported-by: Coverity (CID: 138492, 138495, 143064)
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-09-26 22:14:44 -04:00
parent 146dda3911
commit 3c2dff5490
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/fit_image.c
View File

@ -372,7 +372,7 @@ static int fit_build(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));
goto err;
goto err_buf;
}
ret = write(fd, buf, size);
if (ret != size) {
@ -501,6 +501,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname)
ret = -EIO;
goto err;
}
free(buf);
close(fd);
return 0;
@ -601,6 +602,7 @@ static int fit_import_data(struct image_tool_params *params, const char *fname)
ret = 0;
err:
munmap(old_fdt, sbuf.st_size);
free(fdt);
close(fd);
return ret;