MA-24310 Fix bug: imx_signer failed to sign Android bootloader on i.MX 8m

Android with i.MX 8m platform used HABv4 to verify the signed bootloader.
To make sure all of components in bootloader image be signed, we enabled
a optional function on Android bootloader: Add optional FIT FDT signature
(CVE-2023-39902).
But this tool failed to sign Android bootloader because incorrect CSF
generated. To fix this issue, the optional IVT should use a local image
table to generate the CSF file.

Signed-off-by: Maximus <maximus.sun@nxp.com>

Author: github-sunxc

src/imx_signer.c

@@ -1438,23 +1438,24 @@ static int process_ivt_image(unsigned long off, uint8_t *infile_buf,
     ivt_t *ivt = NULL;
     int err = -E_FAILURE;
     boot_data_t *boot = NULL;
+    image_block_t image_ivt[NUM_IMGS] = {0};
 
     /* Compare the entry address with self address. For kernel images
      * IVT is placed at the end of the image file. In this case the load
      * address is offset(which is image size) minus the difference between
      * self (where the ivt is ) and entry (the beginning of the image).
      * This difference in case of kernel images is 0. For other images like
      * FDT image the offset is non zero*/
-    g_images[0].valid = true;
+    image_ivt[0].valid = true;
     ivt = (ivt_t *)(infile_buf + off);
 
-    g_images[0].load_addr = (ivt->self_addr > ivt->entry)
+    image_ivt[0].load_addr = (ivt->self_addr > ivt->entry)
                             ? ivt->entry
                             : ivt->self_addr;
-    g_images[0].offset = (ivt->self_addr > ivt->entry)
+    image_ivt[0].offset = (ivt->self_addr > ivt->entry)
                          ? (off - (ivt->self_addr - ivt->entry))
                          : off;
-    g_images[0].size =  (ivt->self_addr > ivt->entry)
+    image_ivt[0].size =  (ivt->self_addr > ivt->entry)
                         ? (ivt->csf_addr - ivt->entry)
                         : (ivt->csf_addr - ivt->self_addr);
     csf_offset =  (ivt->csf_addr - ivt->self_addr) + off;
@@ -1469,12 +1470,13 @@ static int process_ivt_image(unsigned long off, uint8_t *infile_buf,
         }
     }
 
-    DEBUG("Image[%d] addr 0x%08lx\n",0, g_images[0].load_addr);
-    DEBUG("Image[%d] offset  0x%08lx\n",0, g_images[0].offset);
-    DEBUG("Image[%d] size 0x%08lx\n",0, g_images[0].size);
+    DEBUG("Image[%d] addr 0x%08lx\n",0, image_ivt[0].load_addr);
+    DEBUG("Image[%d] offset  0x%08lx\n",0, image_ivt[0].offset);
+    DEBUG("Image[%d] size 0x%08lx\n",0, image_ivt[0].size);
     DEBUG("Image[%d] csf_offset 0x%08x\n",0, csf_offset);
+    memcpy(g_images, image_ivt, sizeof(image_block_t));
 
-    err = create_csf_file_v1(g_images, loop, ofname);
+    err = create_csf_file_v1(image_ivt, loop, ofname);
     if (err) {
         errno = EFAULT;
         fprintf(stderr, "ERROR: Couldn't create csf txt file %s\n", strerror(EFAULT));