commit ac7a5e200ca5b91def015c719fe86f9bc52a2cee
author Linux Build Service Account <lnxbuild@localhost> Sun Jan 13 21:54:40 2019 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jan 13 21:54:40 2019 -0800
tree a6636e51989510cbfd49c7ad446ea684b66aacf5
parent 3dee8c7f8fe25906190c758dad94251012f5ce23
parent d1f3373729999b959cb37b99fa6df9a334745c82

Merge "avb: Change block size to support system image"

platform/msm_shared/avb/libavb/avb_slot_verify.c

diff --git a/platform/msm_shared/avb/libavb/avb_slot_verify.c b/platform/msm_shared/avb/libavb/avb_slot_verify.c
index c4039d1..40bfbe5 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -163,7 +163,7 @@
   }
 
   io_ret = ops->read_from_partition(
-            ops, part_name, 0 /* offset */, image_size, &image_buf, &part_num_read);
+            ops, found, 0 /* offset */, image_size, &image_buf, &part_num_read);
 
   if (image_buf == NULL) {
     ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
@@ -421,6 +421,16 @@
   if (is_vbmeta_partition) {
     vbmeta_offset = 0;
     vbmeta_size = VBMETA_MAX_SIZE;
+    io_ret = ops->read_from_partition(ops,
+                                    partition_name,
+                                    vbmeta_offset,
+                                    vbmeta_size,
+                                    &vbmeta_buf,
+                                    &vbmeta_num_read);
+    if (vbmeta_buf == NULL) {
+      ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
+      goto out;
+    }
   } else {
     uint8_t footer_buf[AVB_FOOTER_SIZE];
     size_t footer_num_read;
@@ -458,17 +468,7 @@
     }
     vbmeta_offset = footer.vbmeta_offset;
     vbmeta_size = footer.vbmeta_size;
-  }
-
-  if (avb_strcmp(full_partition_name, "vbmeta") == 0) {
-    io_ret = ops->read_from_partition(ops,
-                                    full_partition_name,
-                                    vbmeta_offset,
-                                    vbmeta_size,
-                                    &vbmeta_buf,
-                                    &vbmeta_num_read);
-  } else { // for chain partitions
-    vbmeta_buf = avb_malloc(vbmeta_size);
+    vbmeta_buf = avb_malloc(vbmeta_size); // for chain partitions
     if (vbmeta_buf == NULL) {
         ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
         goto out;
@@ -480,10 +480,6 @@
                                     vbmeta_buf,
                                     &vbmeta_num_read);
   }
-  if (vbmeta_buf == NULL) {
-    ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
-    goto out;
-  }
 
   if (io_ret == AVB_IO_RESULT_ERROR_OOM) {
     ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;