commit 91f6505bc84d6dfc5a7f364bd53126c0969fee26
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 22 05:25:59 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 22 05:25:58 2018 -0800
tree 234646947978f2560750963673df7564ac83ab34
parent 554f4fd6bd3ce013bf2770750d44d08307f2e7eb
parent 85eabadbdb5eadcb51663c0e33a5b627ebf53988

Merge "avb: Remove use of malloc for disable verification"

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 6d3e64f..c4039d1 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -305,14 +305,8 @@
     }
     avb_debugv(part_name, ": Loading entire partition.\n", NULL);
 
-    image_buf = avb_malloc(image_size);
-    if (image_buf == NULL) {
-      ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
-      goto out;
-    }
-
     io_ret = ops->read_from_partition(
-        ops, part_name, 0 /* offset */, image_size, image_buf, &part_num_read);
+        ops, part_name, 0 /* offset */, image_size, &image_buf, &part_num_read);
     if (io_ret == AVB_IO_RESULT_ERROR_OOM) {
       ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
       goto out;