buildman: Move output-file setup into one place

[platform/kernel/u-boot.git] / tools / default_image.c

diff --git a/tools/default_image.c b/tools/default_image.c
index 0ac3382..0e49ab3 100644 (file)
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -41,6 +41,11 @@ static int image_check_params(struct image_tool_params *params)
                (params->lflag && (params->dflag || params->fflag)));
 }
 
+static void image_print_header(const void *ptr, struct image_tool_params *params)
+{
+       image_print_contents(ptr);
+}
+
 static int image_verify_header(unsigned char *ptr, int image_size,
                        struct image_tool_params *params)
 {
@@ -50,6 +55,12 @@ static int image_verify_header(unsigned char *ptr, int image_size,
        struct legacy_img_hdr header;
        struct legacy_img_hdr *hdr = &header;
 
+       if (image_size < sizeof(struct legacy_img_hdr)) {
+               debug("%s: Bad image size: \"%s\" is no valid image\n",
+                     params->cmdname, params->imagefile);
+               return -FDT_ERR_BADSTRUCTURE;
+       }
+
        /*
         * create copy of header so that we can blank out the
         * checksum field for checking - this can't be done
@@ -76,7 +87,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) {
@@ -185,7 +206,7 @@ U_BOOT_IMAGE_TYPE(
        (void *)&header,
        image_check_params,
        image_verify_header,
-       image_print_contents,
+       image_print_header,
        image_set_header,
        image_extract_subimage,
        image_check_image_types,