commit 08d4586def763729be5916fce33ac41c50874062
author android-build-team Robot <android-build-team-robot@google.com> Fri May 01 01:04:17 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 01 01:04:17 2020 +0000
tree af338c6fe470f4ecf8d78cb1d28caf2edbb6bb9a
parent 37e14a6f6b43baa3b6ff06bade5a39a25fd98b3f
parent 66872e8dc9f4b0aa5fa1eca970430be003003a7b

Snap for 6449986 from 66872e8dc9f4b0aa5fa1eca970430be003003a7b to rvc-release

Change-Id: Ib6d8de60569c3cc46964ce273f5d3b2255d05d98

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