tools: kwbimage: Verify size of v0 image header

Check that extended image header size is not larger than file size.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 542779ed4845c5bb40e79cd5aa1f5f53949d62b9..4709c6d5442753a1365fe15e8dd228a0f692f85e 100644 (file)
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -1670,6 +1670,9 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
                if (mhdr->ext & 0x1) {
                        struct ext_hdr_v0 *ext_hdr;
 
+                       if (header_size + sizeof(*ext_hdr) > image_size)
+                               return -FDT_ERR_BADSTRUCTURE;
+
                        ext_hdr = (struct ext_hdr_v0 *)
                                (ptr + sizeof(struct main_hdr_v0));
                        checksum = image_checksum8(ext_hdr,