diff options
author | Steven Moreland <smoreland@google.com> | 2022-03-08 19:57:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 19:57:09 +0000 |
commit | f681e56cd722fc1260fbd14d8b06b3f8c105c377 (patch) | |
tree | 50418c247ca2ddb3a7eb6948572efbc7d12136e6 | |
parent | c150f2c1cc629c4154933c25b089089e1c787df8 (diff) | |
parent | bfbbb04c096deccf43ad1c52e80c399a7be985ed (diff) | |
download | libhwbinder-f681e56cd722fc1260fbd14d8b06b3f8c105c377.tar.gz |
Merge "libhwbinder: kernel check also in userspace" am: 8b95307fc7 am: 0d37d37576 am: defd5b394d am: bfbbb04c09
Original change: https://android-review.googlesource.com/c/platform/system/libhwbinder/+/2014695
Change-Id: Ib71ba5812b06510c1537cd985728a02fd08d7f8b
-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**>( |