FIT: add image hash validation in iminfo command
The following two patches extend the iminfo command with the ability to check if hashes in a FIT image are valid.
PATCH 1/2 FIT: add ability to check hashes of all images in FIT, improve output
- add function fit_all_image_check_hashes() that verifies if all hashes of all images in the FIT are valid
- improve output of fit_image_check_hashes() when the hash check fails
--- common/image.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++---- include/image.h | 1 + 2 files changed, 57 insertions(+), 5 deletions(-)
common/image.c +56 -5
@@ -2645,27 +2645,29 @@ int fit_image_check_hashes (const void *fit, int image_noffset)continue ;if (fit_image_hash_get_algo (fit, noffset, &algo)) { - err_msg ="Can't get hash algo property" ; + err_msg =" error!\nCan't get hash algo " +"property" ; goto error; }printf ("%s" , algo);if (fit_image_hash_get_value (fit, noffset, &fit_value, &fit_value_len)) { - err_msg ="Can't get hash value property" ; + err_msg =" error!\nCan't get hash value " +"property" ; goto error; }if (calculate_hash (data, size, algo, value, &value_len)) { - err_msg ="Unsupported hash algorithm" ; + err_msg =" error!\nUnsupported hash algorithm" ; goto error; }if (value_len != fit_value_len) { - err_msg ="Bad hash value len" ; + err_msg =" error !\nBad hash value len" ; goto error; }else if (memcmp (value, fit_value, value_len) !=0 ) { - err_msg ="Bad hash value" ; + err_msg =" error!\nBad hash value" ; goto error; }printf ("+ " );
@@ -2682,6 +2684,55 @@ error: }/** +* fit_all_image_check_hashes - verify data intergity for all images +* @fit: pointer to the FIT format image header +* +* fit_all_image_check_hashes() goes over all images in the FIT and +* for every images checks if all it's hashes are valid. +* +* returns: +* 1, if all hashes of all images are valid +* 0, otherwise (or on error) +*/ +int fit_all_image_check_hashes (const void *fit) +{ +int images_noffset; +int noffset; +int ndepth; +int count; + +/* Find images parent node offset */ + images_noffset =fdt_path_offset (fit,FIT_IMAGES_PATH ); +if (images_noffset <0 ) { +printf ("Can't find images parent node '%s' (%s)\n" , +FIT_IMAGES_PATH ,fdt_strerror (images_noffset)); +return 0 ; + } + +/* Process all image subnodes, check hashes for each */ +printf ("## Checking hash(es) for FIT Image@%08lx ...\n" , + (ulong )fit); +for (ndepth =0 , count =0 , + noffset =fdt_next_node (fit, images_noffset, &ndepth); + (noffset >=0 ) && (ndepth >0 ); + noffset =fdt_next_node (fit, noffset, &ndepth)) { +if (ndepth ==1 ) { +/* +* Direct child node of the images parent node, +* i.e. component image node. +*/ +printf (" Hash(es) for Image %u (%s): " , count++, +fit_get_name (fit, noffset,NULL )); + +if (!fit_image_check_hashes (fit, noffset)) +return 0 ; +printf ("\n" ); + } + } +return 1 ; +} + +/** * fit_image_check_os - check whether image node is of a given os type * @fit: pointer to the FIT format image header * @noffset: component image node offset
include/image.h +1 -0
@@ -573,6 +573,7 @@ int fit_image_hash_set_value (void *fit, int noffset, uint8_t *value, int value_len);int fit_image_check_hashes (const void *fit,int noffset); +int fit_all_image_check_hashes (const void *fit);int fit_image_check_os (const void *fit,int noffset,uint8_t os);int fit_image_check_arch (const void *fit,int noffset,uint8_t arch);int fit_image_check_type (const void *fit,int noffset,uint8_t type);
Signature · 1 line
1.5.3.4
Wolfgang Denk
AppliedPATCH 1/2 FIT: add ability to check hashes of all images in FIT, improve output
Dear Bartlomiej Sieka,
Quoted 9 lines · In message <[email protected]> you wrote:
- add function
fit_all_image_check_hashes()that verifies if all hashes of all images in the FIT are valid
- improve output offit_image_check_hashes()when the hash check failsSigned-off-by Bartlomiej Sieka <[email protected]>--- common/image.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++---- include/image.h | 1 + 2 files changed, 57 insertions(+), 5 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Sex is like air. It's only a big deal if you can't get any.
PATCH 2/2 FIT: make iminfo check hashes of all images in FIT, return 1 on failed check
In reply to Bartlomiej Sieka--- common/cmd_bootm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
common/cmd_bootm.c +6 -0
@@ -854,6 +854,12 @@ static int image_info (ulong addr) }fit_print_contents (hdr); + +if (!fit_all_image_check_hashes (hdr)) { +puts ("Bad hash in FIT image!\n" ); +return 1 ; + } +return 0 ;#endif default :
Signature · 1 line
1.5.3.4
Wolfgang Denk
AppliedPATCH 2/2 FIT: make iminfo check hashes of all images in FIT, return 1 on failed check
Dear Bartlomiej Sieka,
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Bartlomiej Sieka <[email protected]>--- common/cmd_bootm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de He had quite a powerful intellect, but it was as powerful like a locomotive, and ran on rails and was therefore almost impossible to steer. - Terry Pratchett, _Lords and Ladies_