commit 66872e8dc9f4b0aa5fa1eca970430be003003a7b
author Nikita Ioffe <ioffe@google.com> Thu Apr 30 02:14:27 2020 +0100
committer Nikita Ioffe <ioffe@google.com> Thu Apr 30 16:56:32 2020 +0100
tree af338c6fe470f4ecf8d78cb1d28caf2edbb6bb9a
parent b73cea24f89621456c950b102d475ffbd4227334

Check that there is enough space for AvbDescriptor

Test: put corrupted apex on /system_ext/apex
Test: verified it's not activated
Test: atest --host libavb_host_unittest
Bug: 146516087
Change-Id: Ic85cbd580b4a5e6514db68359e78fae7455e0fb8

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