diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-01 02:04:17 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-01 02:04:17 +0000 |
commit | d59b2591dbf6b87e2e6000b611f5f5a7116d87a5 (patch) | |
tree | af338c6fe470f4ecf8d78cb1d28caf2edbb6bb9a | |
parent | 3e3dbb7d5050df6042a14259baad70ec2d4e2e91 (diff) | |
parent | b7fe9c3b204c94975335e38f3296b418c1ba9bb0 (diff) | |
download | avb-android11-d1-s1-release.tar.gz |
Snap for 6449999 from b7fe9c3b204c94975335e38f3296b418c1ba9bb0 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: I294dd8ae4fbc11de2833edc7721b573ba52aad81
-rw-r--r-- | libavb/avb_descriptor.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 @@ bool avb_descriptor_foreach(const uint8_t* image_data, } 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); |