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

tools/imagetool: Fix segfault when tparams->verify_header is NULL

Browse Source 
On some image types like i.MX8 and i.MX8M, the verify_header function
is not implemented.

Before this commit, no check on tparams->verify_header was done causing
a segfault if NULL. Now, a proper error message is printed.

Signed-off-by: Nicolas Heemeryck <nicolas.heemeryck@gmail.com>
This commit is contained in:
Nicolas Heemeryck 2022-04-20 23:58:39 +02:00 committed by Tom Rini
parent 5d834bfa5f
commit 30705cd892
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tools/imagetool.c
View File

@ -80,27 +80,33 @@ static int imagetool_verify_print_header_by_type(
struct image_type_params *tparams, struct image_type_params *tparams,
struct image_tool_params *params) struct image_tool_params *params)
{ {
int retval; int retval = -1;
retval = tparams->verify_header((unsigned char *)ptr, sbuf->st_size, if (tparams->verify_header) {
params); retval = tparams->verify_header((unsigned char *)ptr,
sbuf->st_size, params);
if (retval == 0) { if (retval == 0) {
/* /*
* Print the image information if verify is successful * Print the image information if verify is successful
*/ */
if (tparams->print_header) { if (tparams->print_header) {
if (!params->quiet) if (!params->quiet)
tparams->print_header(ptr); tparams->print_header(ptr);
} else {
fprintf(stderr,
"%s: print_header undefined for %s\n",
params->cmdname, tparams->name);
}
} else { } else {
fprintf(stderr, fprintf(stderr,
"%s: print_header undefined for %s\n", "%s: verify_header failed for %s with exit code %d\n",
params->cmdname, tparams->name); params->cmdname, tparams->name, retval);
} }
} else { } else {
fprintf(stderr, fprintf(stderr, "%s: print_header undefined for %s\n",
"%s: verify_header failed for %s with exit code %d\n", params->cmdname, tparams->name);
params->cmdname, tparams->name, retval);
} }
return retval; return retval;