Revert "fdt: Fix FIT header verification in mkimage and conduct same checks as bootm"
PATCH 1/1 Revert "fdt: Fix FIT header verification in mkimage and conduct same checks as bootm"
This reverts commit d32aa3cae44e618048ff7f378577d44f9b6d6dcc.
This breaks the "list_image" test in tests/image/test-imagetools.sh, where mkimage and dumpimage are expected to have the same output:
Listing image contents...
# debian/build/tools/tools/mkimage -l linux.itb debian/build/tools/tools/mkimage: verify_header failed for Default Image support with exit code -9
Obviously, blindly reverting this patch may not the best way forward, but the same verify_header failed message occurs also with some real-world .itb files, such as that used on the pinebook. So it's not just the tests that need to be updated.
live well,
vagrant
---
tools/fit_common.c | 5 +---- tools/fit_common.h | 8 -------- tools/imagetool.c | 34 +--------------------------------- tools/imagetool.h | 19 ------------------- tools/mkimage.c | 2 +- 5 files changed, 3 insertions(+), 65 deletions(-)
tools/fit_common.c +1 -4
@@ -26,10 +26,7 @@int fit_verify_header (unsigned char *ptr,int image_size,struct image_tool_params *params) { -if (fdt_check_header (ptr) !=EXIT_SUCCESS || !fit_check_format (ptr)) -return EXIT_FAILURE ; - -return EXIT_SUCCESS ; +return fdt_check_header (ptr); }int fit_check_image_types (uint8_t type)
tools/fit_common.h +0 -8
@@ -10,14 +10,6 @@#include "mkimage.h" #include <image.h> -/** -* Verify the format of FIT header pointed to by ptr -* -* @ptr: image header to be verified -* @image_size: size of while image -* @params: mkimage parameters -* @return 0 if OK, -1 on error -*/ int fit_verify_header (unsigned char *ptr,int image_size,struct image_tool_params *params);
tools/imagetool.c +1 -33
@@ -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,38 +65,6 @@ 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,
tools/imagetool.h +0 -19
@@ -179,25 +179,6 @@ int imagetool_verify_print_header(struct image_type_params *tparams, struct image_tool_params *params); -/* -* imagetool_verify_print_header_by_type() - verifies the image header -* -* Verify the image_header for the image type given by tparams. -* If verification is successful, this prints the respective header. -* @ptr: pointer the the image header -* @sbuf: stat information about the file pointed to by ptr -* @tparams: image type parameters -* @params: mkimage parameters -* -* @return 0 on success, negative if input image format does not match with -* the given image type -*/ -int imagetool_verify_print_header_by_type ( -void *ptr, -struct stat *sbuf, -struct image_type_params *tparams, -struct image_tool_params *params); -/** * imagetool_save_subimage - store data into a file * @file_name: name of the destination file
tools/mkimage.c +1 -1
@@ -409,7 +409,7 @@ int main(int argc, char **argv)* Print the image information for matched image type * Returns the error code if not matched */ - retval =imagetool_verify_print_header_by_type (ptr, &sbuf, + retval =imagetool_verify_print_header (ptr, &sbuf, tparams, ¶ms); (void )munmap ((void *)ptr, sbuf.st_size);
Signature · 1 line
2.20.1
PATCH 1/1 Revert "fdt: Fix FIT header verification in mkimage and conduct same checks as bootm"
Quoted 11 lines · Vagrant Cascadian
This reverts commit
d32aa3cae44e618048ff7f378577d44f9b6d6dcc.This breaks the "
list_image" test intests/image/test-imagetools.sh, where mkimage and dumpimage are expected to have the same output:Listing image contents...
# debian/build/tools/tools/mkimage -l linux.itb debian/build/tools/tools/mkimage: verify_header failed for Default Image support with exit code -9Obviously, blindly reverting this patch may not the best way forward,
I'll take a look at this today and see if there's a simple way forward without reverting
Quoted 2 lines
but the same
verify_headerfailed message occurs also with some real-world .itb files, such as that used on the pinebook. So it's not
Would you be able to point me to any .its files that fail this check in the real world.
Also are you seeing failures while creating the image from its as well with real world images (mkimage -l its itb) or only when listing the header with -l?
Quoted 147 lines
just the tests that need to be updated.
live well,
vagrantSigned-off-by Vagrant Cascadian <[email protected]>---
tools/fit_common.c | 5 +---- tools/fit_common.h | 8 -------- tools/imagetool.c | 34 +--------------------------------- tools/imagetool.h | 19 ------------------- tools/mkimage.c | 2 +- 5 files changed, 3 insertions(+), 65 deletions(-)tools/fit_common.c +1
-4@@ -26,10 +26,7 @@int fit_verify_header (unsigned char *ptr,int image_size,struct image_tool_params *params) { -if (fdt_check_header (ptr) !=EXIT_SUCCESS || !fit_check_format (ptr)) -return EXIT_FAILURE ; - -return EXIT_SUCCESS ; +return fdt_check_header (ptr); }int fit_check_image_types (uint8_t type)tools/fit_common.h +0
-8@@ -10,14 +10,6 @@#include "mkimage.h" #include <image.h> -/** -* Verify the format of FIT header pointed to by ptr -* -* @ptr: image header to be verified -* @image_size: size of while image -* @params: mkimage parameters -* @return 0 if OK, -1 on error -*/ int fit_verify_header (unsigned char *ptr,int image_size,struct image_tool_params *params);tools/imagetool.c +1
-33@@ -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,38 +65,6 @@ 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,tools/imagetool.h +0
-19@@ -179,25 +179,6 @@ int imagetool_verify_print_header(struct image_type_params *tparams, struct image_tool_params *params); -/* -* imagetool_verify_print_header_by_type() - verifies the image header -* -* Verify the image_header for the image type given by tparams. -* If verification is successful, this prints the respective header. -* @ptr: pointer the the image header -* @sbuf: stat information about the file pointed to by ptr -* @tparams: image type parameters -* @params: mkimage parameters -* -* @return 0 on success, negative if input image format does not match with -* the given image type -*/ -int imagetool_verify_print_header_by_type ( -void *ptr, -struct stat *sbuf, -struct image_type_params *tparams, -struct image_tool_params *params); -/** * imagetool_save_subimage - store data into a file * @file_name: name of the destination file tools/mkimage.c +1
-2@@ -409,7 +409,7 @@ int main(int argc, char **argv)* Print the image information for matched image type * Returns the error code if not matched */ - retval =imagetool_verify_print_header_by_type (ptr, &sbuf, + retval =imagetool_verify_print_header (ptr, &sbuf, tparams, ¶ms); (void )munmap ((void *)ptr, sbuf.st_size); --
Quoted 2 lines
2.20.1
-Jordan
PATCH 1/1 Revert "fdt: Fix FIT header verification in mkimage and conduct same checks as bootm"
(Forgot to reply all. Sorry for the clutter Vagrant)
See the patch I just submitted "fdt: Fix mkimage list to try every header type" for what I believe to be the correct fix for this problem.
Thanks,
Jordan
Quoted 178 lines · Vagrant Cascadian
Quoted 11 lines
This reverts commit
d32aa3cae44e618048ff7f378577d44f9b6d6dcc.This breaks the "
list_image" test intests/image/test-imagetools.sh, where mkimage and dumpimage are expected to have the same output:Listing image contents...
# debian/build/tools/tools/mkimage -l linux.itb debian/build/tools/tools/mkimage: verify_header failed for Default Image support with exit code -9Obviously, blindly reverting this patch may not the best way forward,
I'll take a look at this today and see if there's a simple way forward without reverting
Quoted 2 lines
but the same
verify_headerfailed message occurs also with some real-world .itb files, such as that used on the pinebook. So it's notWould you be able to point me to any .its files that fail this check in the real world.
Also are you seeing failures while creating the image from its as well with real world images (mkimage -l its itb) or only when listing the header with -l?
Quoted 147 lines
just the tests that need to be updated.
live well,
vagrantSigned-off-by Vagrant Cascadian <[email protected]>---
tools/fit_common.c | 5 +---- tools/fit_common.h | 8 -------- tools/imagetool.c | 34 +--------------------------------- tools/imagetool.h | 19 ------------------- tools/mkimage.c | 2 +- 5 files changed, 3 insertions(+), 65 deletions(-)tools/fit_common.c +1
-4@@ -26,10 +26,7 @@int fit_verify_header (unsigned char *ptr,int image_size,struct image_tool_params *params) { -if (fdt_check_header (ptr) !=EXIT_SUCCESS || !fit_check_format (ptr)) -return EXIT_FAILURE ; - -return EXIT_SUCCESS ; +return fdt_check_header (ptr); }int fit_check_image_types (uint8_t type)tools/fit_common.h +0
-8@@ -10,14 +10,6 @@#include "mkimage.h" #include <image.h> -/** -* Verify the format of FIT header pointed to by ptr -* -* @ptr: image header to be verified -* @image_size: size of while image -* @params: mkimage parameters -* @return 0 if OK, -1 on error -*/ int fit_verify_header (unsigned char *ptr,int image_size,struct image_tool_params *params);tools/imagetool.c +1
-33@@ -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,38 +65,6 @@ 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,tools/imagetool.h +0
-19@@ -179,25 +179,6 @@ int imagetool_verify_print_header(struct image_type_params *tparams, struct image_tool_params *params); -/* -* imagetool_verify_print_header_by_type() - verifies the image header -* -* Verify the image_header for the image type given by tparams. -* If verification is successful, this prints the respective header. -* @ptr: pointer the the image header -* @sbuf: stat information about the file pointed to by ptr -* @tparams: image type parameters -* @params: mkimage parameters -* -* @return 0 on success, negative if input image format does not match with -* the given image type -*/ -int imagetool_verify_print_header_by_type ( -void *ptr, -struct stat *sbuf, -struct image_type_params *tparams, -struct image_tool_params *params); -/** * imagetool_save_subimage - store data into a file * @file_name: name of the destination file tools/mkimage.c +1
-2@@ -409,7 +409,7 @@ int main(int argc, char **argv)* Print the image information for matched image type * Returns the error code if not matched */ - retval =imagetool_verify_print_header_by_type (ptr, &sbuf, + retval =imagetool_verify_print_header (ptr, &sbuf, tparams, ¶ms); (void )munmap ((void *)ptr, sbuf.st_size); --Quoted 2 lines
2.20.1
-Jordan
PATCH 1/1 Revert "fdt: Fix FIT header verification in mkimage and conduct same checks as bootm"
In reply to Jordan HandFTR, using updated email addresses for agraf and sjg.
Quoted 7 lines · Jordan Hand
Quoted 6 lines · Vagrant Cascadian
This reverts commit
d32aa3cae44e618048ff7f378577d44f9b6d6dcc.This breaks the "
list_image" test intests/image/test-imagetools.sh, where mkimage and dumpimage are expected to have the same output:
Quoted 8 lines
Quoted 5 lines
Listing image contents...
# debian/build/tools/tools/mkimage -l linux.itb debian/build/tools/tools/mkimage: verify_header failed for Default Image support with exit code -9Obviously, blindly reverting this patch may not the best way forward,
I'll take a look at this today and see if there's a simple way forward without reverting
Thanks!
Quoted 5 lines
Quoted 2 lines
but the same
verify_headerfailed message occurs also with some real-world .itb files, such as that used on the pinebook. So it's notWould you be able to point me to any .its files that fail this check in the real world.
The one created by: board/sunxi/mksunxi_fit_atf.sh
I haven't confirmed, but I would guess possibly also:arch/arm/mach-rockchip/make_fit_atf.py
If needed, I can try to get some actual .its/.itb files to work with.
Quoted 3 lines
Also are you seeing failures while creating the image from its as well with real world images (mkimage -l its itb) or only when listing the header with -l?
It *seems* to create the images just fine; apparently only when listing them. The output of "dumpimage -l" and "mkimage -l" used to be the same, and "dumpimage -l" still works fine.
live well,
vagrant
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190409/2f93d3fe/attachment.sig>