Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594, 14651881, 14651915, 14651882, 14651883, 14651799, 14652154, 14651595, 14651760, 14652271, 14652272, 14652273, 14652056, 14651800, 14651801, 14651802, 14651884, 14651885, 14651886, 14652274, 14652275, 14652276, 14652277, 14652278, 14651894, 14651723, 14652211, 14651895, 14651916, 14651887, 14651888, 14651596, 14651889, 14652212, 14651761, 14652310, 14652311, 14651973, 14651974, 14652312, 14652313, 14651896, 14651803] into rvc-qpr3-release
Change-Id: If4b77f492ba67051f13fe05bc3371dc3acd61c6c
diff --git a/Parcel.cpp b/Parcel.cpp
index f1d6dbd..2c6bf5d 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -1342,6 +1342,19 @@
static_cast<uint64_t>(buffer_obj->parent_offset), parentOffset);
return false;
}
+
+ binder_buffer_object *parentBuffer =
+ reinterpret_cast<binder_buffer_object*>(mData + mObjects[parent]);
+ void* bufferInParent = *reinterpret_cast<void**>(
+ reinterpret_cast<uint8_t*>(parentBuffer->buffer) + parentOffset);
+ void* childBuffer = reinterpret_cast<void*>(buffer_obj->buffer);
+
+ if (bufferInParent != childBuffer) {
+ ALOGE("Buffer in parent %p differs from embedded buffer %p",
+ bufferInParent, childBuffer);
+ android_errorWriteLog(0x534e4554, "179289794");
+ return false;
+ }
}
return true;
@@ -1427,12 +1440,31 @@
size_t parent_buffer_handle,
size_t parent_offset) const
{
- status_t status;
uint64_t nativeHandleSize;
- size_t fdaParent;
+ status_t status = readUint64(&nativeHandleSize);
+ if (status != OK) {
+ return BAD_VALUE;
+ }
- status = readUint64(&nativeHandleSize);
- if (status != OK || nativeHandleSize == 0) {
+ if (nativeHandleSize == 0) {
+ // If !embedded, then parent_* vars are 0 and don't actually correspond
+ // to anything. In that case, we're actually reading this data into
+ // writable memory, and the handle returned from here will actually be
+ // used (rather than be ignored).
+ if (embedded) {
+ binder_buffer_object *parentBuffer =
+ reinterpret_cast<binder_buffer_object*>(mData + mObjects[parent_buffer_handle]);
+
+ void* bufferInParent = *reinterpret_cast<void**>(
+ reinterpret_cast<uint8_t*>(parentBuffer->buffer) + parent_offset);
+
+ if (bufferInParent != nullptr) {
+ ALOGE("Buffer in (handle) parent %p is not nullptr.", bufferInParent);
+ android_errorWriteLog(0x534e4554, "179289794");
+ return BAD_VALUE;
+ }
+ }
+
*handle = nullptr;
return status;
}
@@ -1442,6 +1474,7 @@
return BAD_VALUE;
}
+ size_t fdaParent;
if (embedded) {
status = readNullableEmbeddedBuffer(nativeHandleSize, &fdaParent,
parent_buffer_handle, parent_offset,
