mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 16:52:14 +02:00
fdt: Fix FIT header verification in mkimage and conduct same checks as bootm
FIT header verification in mkimage was treating a return code as a boolean, which meant that failures in validating the fit were seen as successes. Additionally, mkimage was checking all formats to find a header which passes validation, rather than using the image type specified to mkimage. checkpatch.pl checks for lines ending with '(' and alignment matching open parentheses are ignored to keep with existing coding style. Signed-off-by: Jordan Hand <jorhand@microsoft.com>
This commit is contained in:
@@ -46,7 +46,7 @@ int imagetool_verify_print_header(
|
||||
|
||||
if (retval == 0) {
|
||||
/*
|
||||
* Print the image information if verify is
|
||||
* Print the image information if verify is
|
||||
* successful
|
||||
*/
|
||||
if ((*curr)->print_header) {
|
||||
@@ -65,6 +65,38 @@ int imagetool_verify_print_header(
|
||||
return retval;
|
||||
}
|
||||
|
||||
int imagetool_verify_print_header_by_type(
|
||||
void *ptr,
|
||||
struct stat *sbuf,
|
||||
struct image_type_params *tparams,
|
||||
struct image_tool_params *params)
|
||||
{
|
||||
int retval;
|
||||
|
||||
retval = tparams->verify_header((unsigned char *)ptr, sbuf->st_size,
|
||||
params);
|
||||
|
||||
if (retval == 0) {
|
||||
/*
|
||||
* Print the image information if verify is successful
|
||||
*/
|
||||
if (tparams->print_header) {
|
||||
if (!params->quiet)
|
||||
tparams->print_header(ptr);
|
||||
} else {
|
||||
fprintf(stderr,
|
||||
"%s: print_header undefined for %s\n",
|
||||
params->cmdname, tparams->name);
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr,
|
||||
"%s: verify_header failed for %s with exit code %d\n",
|
||||
params->cmdname, tparams->name, retval);
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
int imagetool_save_subimage(
|
||||
const char *file_name,
|
||||
ulong file_data,
|
||||
|
Reference in New Issue
Block a user