mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 12:14:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools: default_image: Accept images with padding

Browse Source 
If image file is stored on flash partition then it contains padding, which
is not part of the image itself. Image data size is stored in the image
header. So use image size from the header instead of expecting that total
image file size is size of the header plus size of the image data. This
allows dumpimage to parse image files with padding (e.g. dumped from flash
partition).

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Pali Rohár 2023-01-29 17:44:11 +01:00 committed by Tom Rini
parent 3f837b06b7
commit 598e911f23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/default_image.c
View File

@ -82,7 +82,17 @@ static int image_verify_header(unsigned char *ptr, int image_size,
}
data = (const unsigned char *)ptr + sizeof(struct legacy_img_hdr);
len = image_size - sizeof(struct legacy_img_hdr);
len = image_get_data_size(hdr);
if (image_get_type(hdr) == IH_TYPE_FIRMWARE_IVT)
/* Add size of CSF minus IVT */
len -= 0x2060 - sizeof(flash_header_v2_t);
if (image_size - sizeof(struct legacy_img_hdr) < len) {
debug("%s: Bad image size: \"%s\" is no valid image\n",
params->cmdname, params->imagefile);
return -FDT_ERR_BADSTRUCTURE;
}
checksum = be32_to_cpu(hdr->ih_dcrc);
if (crc32(0, data, len) != checksum) {