fix dumpimage for fit images
cover fix dumpimage for fit images
dumpimage does not work properly when an image includes "@" because signing would fail. However, this should be supported because it is enabled by default (even when signing is disabled). This patch series tries to fix this by just printing a warning instead of failing completely.
Stefan Eichenberger (2):
tools/fitimage: remove redundant format check tools/fitimage: make sure dumpimage still works when "@" are detected
tools/fit_common.c | 12 ++++++++++-- tools/fit_image.c | 5 ----- 2 files changed, 10 insertions(+), 7 deletions(-)
Signature · 1 line
2.32.0
PATCH 1/2 tools/fitimage: remove redundant format check
fit_extract_contents does a fit_check_format even thought it was already checked during imagetool_verify_print_header.
Therefore, this check is not necessary. This commit removes the redundancy.
--- tools/fit_image.c | 5 ----- 1 file changed, 5 deletions(-)
tools/fit_image.c +0 -5
@@ -884,11 +884,6 @@ static int fit_extract_contents(void *ptr, struct image_tool_params *params)/* Indent string is defined in header image.h */ p =IMAGE_INDENT_STRING ; -if (fit_check_format (fit,IMAGE_SIZE_INVAL )) { -printf ("Bad FIT image format\n" ); -return -1 ; - } -/* Find images parent node offset */ images_noffset =fdt_path_offset (fit,FIT_IMAGES_PATH );if (images_noffset <0 ) {
Signature · 1 line
2.32.0
PATCH 2/2 tools/fitimage: make sure dumpimage still works when "@" are detected
In reply to Stefan Eichenbergerfit_verify_header fails if it detects unit addresses "@". However, this will break tools like dumpimage on fit images which worked with previous versions of the tool (e.g. 2020.04 vs 2021.07). As an example the output of:
dumpimage -l <fit image>
is:
FIT description: U-Boot fitImage for Linux Distribution Created: Thu Jan 1 01:00:00 1970 Image 0 (kernel@1) Description: Linux kernel Created: Thu Jan 1 01:00:00 1970 Type: Kernel Image Compression: gzip compressed Data Size: 6442456 Bytes = 6291.46 KiB = 6.14 MiB Architecture: AArch64 OS: Linux Load Address: 0x80080000 Entry Point: 0x80080000 Hash algo: sha256 Hash value: ... Image 1 (fdt@freescale_fsl-s32g274a-evb.dtb) Description: Flattened Device Tree blob Created: Thu Jan 1 01:00:00 1970 Type: Flat Device Tree Compression: uncompressed Data Size: 39661 Bytes = 38.73 KiB = 0.04 MiB Architecture: AArch64 Hash algo: sha256 Hash value: ... Default Configuration: 'conf@freescale_fsl-s32g274a-evb.dtb' Configuration 0 (conf@freescale_fsl-s32g274a-evb.dtb) Description: 1 Linux kernel, FDT blob Kernel: kernel@1 FDT: fdt@freescale_fsl-s32g274a-evb.dtb Hash algo: sha256 Hash value: unavailable
But with newer version it shows:
dumpimage -l <fit image>
GP Header: Size d00dfeed LoadAddr 62f0a4
This commit will output a warning that unit addresses were detected but will not fail:
dumpimage -l <fit image>
Image contains unit addresses @, this will break signing
...
--- tools/fit_common.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
tools/fit_common.c +10 -2
@@ -26,10 +26,18 @@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,IMAGE_SIZE_INVAL )) +int ret; + +if (fdt_check_header (ptr) !=EXIT_SUCCESS )return EXIT_FAILURE ; + ret =fit_check_format (ptr,IMAGE_SIZE_INVAL ); +if (ret) { +if (ret != -EADDRNOTAVAIL ) +return EXIT_FAILURE ; +fprintf (stderr,"Image contains unit addresses @, this will break signing\n" ); + } +return EXIT_SUCCESS ; }
Signature · 1 line
2.32.0
Re: [PATCH 1/2] tools/fitimage: remove redundant format check
In reply to Stefan EichenbergerQuoted 11 lines · Stefan Eichenberger
fit_extract_contentsdoes afit_check_formateven thought it was already checked duringimagetool_verify_print_header.
Therefore, this check is not necessary. This commit removes the redundancy.Signed-off-by Stefan Eichenberger <[email protected]>--- tools/fit_image.c | 5 ----- 1 file changed, 5 deletions(-)
Re: [PATCH 2/2] tools/fitimage: make sure dumpimage still works when "@" are detected
In reply to Stefan EichenbergerQuoted 48 lines · Stefan Eichenberger
fit_verify_headerfails if it detects unit addresses "@". However, this will break tools like dumpimage on fit images which worked with previous versions of the tool (e.g. 2020.04 vs 2021.07). As an example the output of:
dumpimage -l <fit image>
is:FIT description: U-Boot fitImage for Linux Distribution Created: Thu Jan 1 01:00:00 1970 Image 0 (kernel@1) Description: Linux kernel Created: Thu Jan 1 01:00:00 1970 Type: Kernel Image Compression: gzip compressed Data Size: 6442456 Bytes = 6291.46 KiB = 6.14 MiB Architecture: AArch64 OS: Linux Load Address: 0x80080000 Entry Point: 0x80080000 Hash algo: sha256 Hash value: ... Image 1 (fdt@freescale_fsl-s32g274a-evb.dtb) Description: Flattened Device Tree blob Created: Thu Jan 1 01:00:00 1970 Type: Flat Device Tree Compression: uncompressed Data Size: 39661 Bytes = 38.73 KiB = 0.04 MiB Architecture: AArch64 Hash algo: sha256 Hash value: ... Default Configuration: 'conf@freescale_fsl-s32g274a-evb.dtb' Configuration 0 (conf@freescale_fsl-s32g274a-evb.dtb) Description: 1 Linux kernel, FDT blob Kernel: kernel@1 FDT: fdt@freescale_fsl-s32g274a-evb.dtb Hash algo: sha256 Hash value: unavailableBut with newer version it shows:
dumpimage -l <fit image>
GP Header: Sized00dfeedLoadAddr 62f0a4This commit will output a warning that unit addresses were detected but will not fail:
dumpimage -l <fit image>
Image contains unit addresses @, this will break signing
...
Quoted 4 lines
Signed-off-by Stefan Eichenberger <[email protected]>--- tools/fit_common.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
Re: [PATCH 1/2] tools/fitimage: remove redundant format check
In reply to Stefan EichenbergerQuoted 7 lines · Stefan Eichenberger
fit_extract_contentsdoes afit_check_formateven thought it was already checked duringimagetool_verify_print_header.
Therefore, this check is not necessary. This commit removes the redundancy.Signed-off-by Stefan Eichenberger <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH 2/2] tools/fitimage: make sure dumpimage still works when "@" are detected
In reply to Stefan EichenbergerQuoted 41 lines · Stefan Eichenberger
fit_verify_headerfails if it detects unit addresses "@". However, this will break tools like dumpimage on fit images which worked with previous versions of the tool (e.g. 2020.04 vs 2021.07). As an example the output of:
dumpimage -l <fit image>
is:FIT description: U-Boot fitImage for Linux Distribution Created: Thu Jan 1 01:00:00 1970 Image 0 (kernel@1) Description: Linux kernel Created: Thu Jan 1 01:00:00 1970 Type: Kernel Image Compression: gzip compressed Data Size: 6442456 Bytes = 6291.46 KiB = 6.14 MiB Architecture: AArch64 OS: Linux Load Address: 0x80080000 Entry Point: 0x80080000 Hash algo: sha256 Hash value: ... Image 1 (fdt@freescale_fsl-s32g274a-evb.dtb) Description: Flattened Device Tree blob Created: Thu Jan 1 01:00:00 1970 Type: Flat Device Tree Compression: uncompressed Data Size: 39661 Bytes = 38.73 KiB = 0.04 MiB Architecture: AArch64 Hash algo: sha256 Hash value: ... Default Configuration: 'conf@freescale_fsl-s32g274a-evb.dtb' Configuration 0 (conf@freescale_fsl-s32g274a-evb.dtb) Description: 1 Linux kernel, FDT blob Kernel: kernel@1 FDT: fdt@freescale_fsl-s32g274a-evb.dtb Hash algo: sha256 Hash value: unavailableBut with newer version it shows:
dumpimage -l <fit image>
GP Header: Sized00dfeedLoadAddr 62f0a4
Quoted 8 lines
This commit will output a warning that unit addresses were detected but will not fail:
dumpimage -l <fit image>
Image contains unit addresses @, this will break signing
...Signed-off-by Stefan Eichenberger <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom