commit e533f5a1f11e8a6ee16164849c85fb2c9b2aa5b7
author Jan Monsch <jpm@google.com> Thu Apr 30 23:22:43 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 30 23:22:43 2020 +0000
tree 673f25c46c04847b39a3f56de755c5bcfefc4a0a
parent fc7adc2b7b7be51b3506940364a1ca499c271a78
parent 570dcededca62c0c5b28935ca78df12077176c22

Changed avbtool to be run with the embedded launcher. am: 653bdd3db6 am: 570dcededc

Change-Id: I0e7b8fae637cdda8fde72d7daf39cf5a76a70d22

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);