commit 91148aaedd2dbd197d844e268862e109b757628d
author Bob Badour <bbadour@google.com> Tue May 05 23:06:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 05 23:06:23 2020 +0000
tree 009235d10fe390ca3783f4cb70b76cbd45500df6
parent e533f5a1f11e8a6ee16164849c85fb2c9b2aa5b7
parent 3dba77a07af0fc745dab9fa053a22040e728fe0b

Add METADATA to avb: Apache2+MIT+BSD=NOTICE am: 57769d6825 am: 3dba77a07a

Change-Id: If9838e926ddc7478f481d5efb52d97bbd8e4b1c6

libavb/avb_descriptor.c

diff --git a/libavb/avb_descriptor.c b/libavb/avb_descriptor.c
index cfc2aac..7030a40 100644
--- a/libavb/avb_descriptor.c
+++ b/libavb/avb_descriptor.c
@@ -88,6 +88,10 @@
   }
 
   for (p = desc_start; p < desc_end;) {
+    if (p + sizeof(AvbDescriptor) > desc_end) {
+      avb_error("Invalid descriptor length.\n");
+      goto out;
+    }
     const AvbDescriptor* dh = (const AvbDescriptor*)p;
     avb_assert_aligned(dh);
     uint64_t nb_following = avb_be64toh(dh->num_bytes_following);