commit 6f6d59ec9d52489415ec5924d3be945db0f04b43
author Firoz Khan <firozk@codeaurora.org> Wed Sep 19 14:24:13 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 19 23:52:45 2018 -0700
tree 6b745f60b04d05dd7931229bb666514558396a70
parent 1ed3e8b6c1e0378ba11bbfaa9c985910b9b05549

platform: msm_shared: avb: perfrom NULL check

avb_descriptor_get_all function can return NULL.
Need to perform a NULL check before it get accessed.

Change-Id: I698a322d6ccde3b0fd5a75452dedb17eecc2faed
Signed-off-by: Firoz Khan <firozk@codeaurora.org>

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 ac17e93..42ee9be 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -716,6 +716,11 @@
    */
   descriptors =
       avb_descriptor_get_all(vbmeta_buf, vbmeta_num_read, &num_descriptors);
+  if (descriptors == NULL) {
+    ret = AVB_SLOT_VERIFY_RESULT_ERROR_INVALID_METADATA;
+    goto out;
+  }
+
   for (n = 0; n < num_descriptors; n++) {
     AvbDescriptor desc;