commit 7673e595d101eaf31b6934cc8d5c2c407c40fda7
author David Vincze <david.vincze@arm.com> Mon Oct 28 11:08:56 2019 +0100
committer Tamas Ban <tamas.ban@arm.com> Mon Dec 16 13:39:25 2019 +0000
tree 38f506ce1096e15a07b05f78438bef8fbd5f9cf8
parent c256612e0e773c76ae07dc8de7f776e3c029d7b0

Boot: Pass image header to LOAD_IMAGE_DATA macro

Pass the image header pointer as an argument to the LOAD_IMAGE_DATA
macro instead of assuming it exists in the given scope with the
name "hdr".

Change-Id: I169d18427ba908f5b169ff276147dd9098afd9f6
Signed-off-by: David Vincze <david.vincze@arm.com>

bl2/ext/mcuboot/bootutil/src/image_validate.c

diff --git a/bl2/ext/mcuboot/bootutil/src/image_validate.c b/bl2/ext/mcuboot/bootutil/src/image_validate.c
index 53ac659..841f183 100644
--- a/bl2/ext/mcuboot/bootutil/src/image_validate.c
+++ b/bl2/ext/mcuboot/bootutil/src/image_validate.c
@@ -225,7 +225,7 @@
      * the security counter TLV.
      */
     while (off < end) {
-        rc = LOAD_IMAGE_DATA(fap, off, &tlv, sizeof(tlv));
+        rc = LOAD_IMAGE_DATA(hdr, fap, off, &tlv, sizeof(tlv));
         if (rc != 0) {
             return BOOT_EFLASH;
         }
@@ -237,7 +237,7 @@
                 break;
             }
 
-            rc = LOAD_IMAGE_DATA(fap, off + sizeof(tlv),
+            rc = LOAD_IMAGE_DATA(hdr, fap, off + sizeof(tlv),
                                  img_security_cnt, tlv.it_len);
             if (rc != 0) {
                 return BOOT_EFLASH;
@@ -314,7 +314,7 @@
      * and are able to do.
      */
     while (off < end) {
-        rc = LOAD_IMAGE_DATA(fap, off, &tlv, sizeof(tlv));
+        rc = LOAD_IMAGE_DATA(hdr, fap, off, &tlv, sizeof(tlv));
         if (rc) {
             return rc;
         }
@@ -327,7 +327,8 @@
             if (tlv.it_len != sizeof(hash)) {
                 return -1;
             }
-            rc = LOAD_IMAGE_DATA(fap, off + sizeof(tlv), buf, sizeof(hash));
+            rc = LOAD_IMAGE_DATA(hdr, fap, off + sizeof(tlv),
+                                 buf, sizeof(hash));
             if (rc) {
                 return rc;
             }
@@ -345,7 +346,7 @@
             if (tlv.it_len > 32) {
                 return -1;
             }
-            rc = LOAD_IMAGE_DATA(fap, off + sizeof(tlv), buf, tlv.it_len);
+            rc = LOAD_IMAGE_DATA(hdr, fap, off + sizeof(tlv), buf, tlv.it_len);
             if (rc) {
                 return rc;
             }
@@ -362,7 +363,8 @@
             if (tlv.it_len > sizeof(key_buf)) {
                 return -1;
             }
-            rc = LOAD_IMAGE_DATA(fap, off + sizeof(tlv), key_buf, tlv.it_len);
+            rc = LOAD_IMAGE_DATA(hdr, fap, off + sizeof(tlv),
+                                 key_buf, tlv.it_len);
             if (rc) {
                 return rc;
             }
@@ -378,7 +380,8 @@
                 if (!EXPECTED_SIG_LEN(tlv.it_len) || tlv.it_len > sizeof(buf)) {
                     return -1;
                 }
-                rc = LOAD_IMAGE_DATA(fap, off + sizeof(tlv), buf, tlv.it_len);
+                rc = LOAD_IMAGE_DATA(hdr, fap, off + sizeof(tlv),
+                                     buf, tlv.it_len);
                 if (rc) {
                     return -1;
                 }
@@ -400,7 +403,7 @@
                 return -1;
             }
 
-            rc = LOAD_IMAGE_DATA(fap, off + sizeof(tlv),
+            rc = LOAD_IMAGE_DATA(hdr, fap, off + sizeof(tlv),
                                  &img_security_cnt, tlv.it_len);
             if (rc) {
                 return rc;