diff options
author | Steven Moreland <smoreland@google.com> | 2022-03-08 18:17:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-08 18:17:18 +0000 |
commit | 8b95307fc737e193c038b61a305eda173ea2c19a (patch) | |
tree | 50418c247ca2ddb3a7eb6948572efbc7d12136e6 | |
parent | 8817ca370ba73ce76f30d005c35d0e28ccca45a2 (diff) | |
parent | 487bee35e0416f6aa7c79c5e1f1a184f92609d43 (diff) | |
download | libhwbinder-8b95307fc737e193c038b61a305eda173ea2c19a.tar.gz |
Merge "libhwbinder: kernel check also in userspace"
-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**>( |