commit 411ac87ee8e4da7b8ed8707e79ec1f63988db6f0
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 29 23:16:02 2021 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 29 23:16:02 2021 -0700
tree b118aa972dfddfe66cb13f63d9624cd8ab11bfcf
parent f5f8bee0a65825b2f8e93963880566d5d254e3e0
parent 7dce154e9ea3b9aa5a68fe4ce566ed848f59a25c

Merge "platform: avb: Fixed avb access an invalid buffer"

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 a76999a..4561cdd 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -1175,6 +1175,13 @@
         total_size += slot_data->vbmeta_images[n].vbmeta_size;
       }
       tbuf = avb_malloc(total_size);
+      if(tbuf == NULL)
+      {
+        avb_error("Failed to allocate memory for tbuf\n");
+        ret = AVB_SLOT_VERIFY_RESULT_ERROR_IO;
+        avb_free(digest);
+        goto out;
+      }
 
       for (n = 0; n < slot_data->num_vbmeta_images; n++) {
         avb_memcpy(tbuf + prev_sz, slot_data->vbmeta_images[n].vbmeta_data,