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

tools/mxsimage: Remove fclose on empty FILE pointer

Browse Source 
If `sb_load_cmdfile()` fails to open the configuration file it will jump
to error handling where the code will try to `fclose()` the FILE pointer
which is NULL causing `mkimage` to segfault.

This patch removes the label for error handling and instead returns
immediately which skips the `fclose()` and prevents the segfault. The
errno is also described in the error message to guide users.

Signed-off-by: Mattias Hansson <hansson.mattias@gmail.com>
Reviewed-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Mattias Hansson 2021-11-24 13:10:49 +01:00 committed by Stefano Babic
parent c4c1ed68c1
commit eb1c716c6d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/mxsimage.c
View File

@ -1595,8 +1595,11 @@ static int sb_load_cmdfile(struct sb_image_ctx *ictx)
size_t len; size_t len;
fp = fopen(ictx->cfg_filename, "r"); fp = fopen(ictx->cfg_filename, "r");
if (!fp) if (!fp) {
goto err_file; fprintf(stderr, "ERR: Failed to load file \"%s\": \"%s\"\n",
ictx->cfg_filename, strerror(errno));
return -EINVAL;
}
while ((rlen = getline(&line, &len, fp)) > 0) { while ((rlen = getline(&line, &len, fp)) > 0) {
memset(&cmd, 0, sizeof(cmd)); memset(&cmd, 0, sizeof(cmd));
@ -1616,12 +1619,6 @@ static int sb_load_cmdfile(struct sb_image_ctx *ictx)
fclose(fp); fclose(fp);
return 0; return 0;
err_file:
fclose(fp);
fprintf(stderr, "ERR: Failed to load file \"%s\"\n",
ictx->cfg_filename);
return -EINVAL;
} }
static int sb_build_tree_from_cfg(struct sb_image_ctx *ictx) static int sb_build_tree_from_cfg(struct sb_image_ctx *ictx)