diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-14 07:08:05 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-14 07:08:05 +0000 |
commit | 23cec2d35155b3fba55b4a7a3a25258f8a863255 (patch) | |
tree | 50418c247ca2ddb3a7eb6948572efbc7d12136e6 | |
parent | 2d3ad17e2e73e61d690ffbe7a9bc743f3dc929c1 (diff) | |
parent | 8b95307fc737e193c038b61a305eda173ea2c19a (diff) | |
download | libhwbinder-main-cg-testing-release.tar.gz |
Snap for 8294919 from 8b95307fc737e193c038b61a305eda173ea2c19a to main-cg-testing-releasemain-cg-testing-release
Change-Id: I2e4a78ba5f2c93cac687d2a9a9485934bb118a3b
-rw-r--r-- | Parcel.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1333,11 +1333,17 @@ bool Parcel::verifyBufferObject(const binder_buffer_object *buffer_obj, return false; } if (buffer_obj->parent_offset != parentOffset) { - ALOGE("Buffer parent offset %" PRIu64 " does not match expected offset %zu.", + ALOGE("Buffer parent offset %" PRIu64 " does not match expected offset %zu.", static_cast<uint64_t>(buffer_obj->parent_offset), parentOffset); return false; } + // checked by kernel driver, but needed for fuzzer + if (parent >= mObjectsSize) { + ALOGE("Parent index %zu but only have %zu objects", parent, mObjectsSize); + return false; + } + binder_buffer_object *parentBuffer = reinterpret_cast<binder_buffer_object*>(mData + mObjects[parent]); void* bufferInParent = *reinterpret_cast<void**>( |