Changes to support new v4.12.3 headers.
Most of the binder code is in the upstream headers, but there are still
some differences. Update to use as much as possible from the real kernel
headers and use the slightly different field names.
Test: Built and booted angler.
Change-Id: I6358b3a689a1daead0dcf695166353b6b5b75a71
diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp
index dc4b0e1..3818567 100644
--- a/IPCThreadState.cpp
+++ b/IPCThreadState.cpp
@@ -906,28 +906,29 @@
int32_t handle, uint32_t code, const Parcel& data, status_t* statusBuffer)
{
binder_transaction_data_sg tr_sg;
- tr_sg.tr.target.ptr = 0; /* Don't pass uninitialized stack data to a remote process */
- tr_sg.tr.target.handle = handle;
- tr_sg.tr.code = code;
- tr_sg.tr.flags = binderFlags;
- tr_sg.tr.cookie = 0;
- tr_sg.tr.sender_pid = 0;
- tr_sg.tr.sender_euid = 0;
+ /* Don't pass uninitialized stack data to a remote process */
+ tr_sg.transaction_data.target.ptr = 0;
+ tr_sg.transaction_data.target.handle = handle;
+ tr_sg.transaction_data.code = code;
+ tr_sg.transaction_data.flags = binderFlags;
+ tr_sg.transaction_data.cookie = 0;
+ tr_sg.transaction_data.sender_pid = 0;
+ tr_sg.transaction_data.sender_euid = 0;
const status_t err = data.errorCheck();
if (err == NO_ERROR) {
- tr_sg.tr.data_size = data.ipcDataSize();
- tr_sg.tr.data.ptr.buffer = data.ipcData();
- tr_sg.tr.offsets_size = data.ipcObjectsCount()*sizeof(binder_size_t);
- tr_sg.tr.data.ptr.offsets = data.ipcObjects();
+ tr_sg.transaction_data.data_size = data.ipcDataSize();
+ tr_sg.transaction_data.data.ptr.buffer = data.ipcData();
+ tr_sg.transaction_data.offsets_size = data.ipcObjectsCount()*sizeof(binder_size_t);
+ tr_sg.transaction_data.data.ptr.offsets = data.ipcObjects();
tr_sg.buffers_size = data.ipcBufferSize();
} else if (statusBuffer) {
- tr_sg.tr.flags |= TF_STATUS_CODE;
+ tr_sg.transaction_data.flags |= TF_STATUS_CODE;
*statusBuffer = err;
- tr_sg.tr.data_size = sizeof(status_t);
- tr_sg.tr.data.ptr.buffer = reinterpret_cast<uintptr_t>(statusBuffer);
- tr_sg.tr.offsets_size = 0;
- tr_sg.tr.data.ptr.offsets = 0;
+ tr_sg.transaction_data.data_size = sizeof(status_t);
+ tr_sg.transaction_data.data.ptr.buffer = reinterpret_cast<uintptr_t>(statusBuffer);
+ tr_sg.transaction_data.offsets_size = 0;
+ tr_sg.transaction_data.data.ptr.offsets = 0;
tr_sg.buffers_size = 0;
} else {
return (mLastError = err);
diff --git a/Parcel.cpp b/Parcel.cpp
index cc3d957..da62ad0 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -98,7 +98,7 @@
void acquire_binder_object(const sp<ProcessState>& proc,
const flat_binder_object& obj, const void* who)
{
- switch (obj.type) {
+ switch (obj.hdr.type) {
case BINDER_TYPE_BINDER:
if (obj.binder) {
LOG_REFS("Parcel %p acquiring reference on local %p", who, obj.cookie);
@@ -124,7 +124,7 @@
}
}
- ALOGD("Invalid object type 0x%08x", obj.type);
+ ALOGD("Invalid object type 0x%08x", obj.hdr.type);
}
void acquire_object(const sp<ProcessState>& proc, const binder_object_header& obj,
@@ -144,7 +144,7 @@
void release_object(const sp<ProcessState>& proc,
const flat_binder_object& obj, const void* who)
{
- switch (obj.type) {
+ switch (obj.hdr.type) {
case BINDER_TYPE_BINDER:
if (obj.binder) {
LOG_REFS("Parcel %p releasing reference on local %p", who, obj.cookie);
@@ -184,7 +184,7 @@
}
}
- ALOGE("Invalid object type 0x%08x", obj.type);
+ ALOGE("Invalid object type 0x%08x", obj.hdr.type);
}
inline static status_t finish_flatten_binder(
@@ -206,7 +206,7 @@
ALOGE("null proxy");
}
const int32_t handle = proxy ? proxy->handle() : 0;
- obj.type = BINDER_TYPE_HANDLE;
+ obj.hdr.type = BINDER_TYPE_HANDLE;
obj.flags = FLAT_BINDER_FLAG_ACCEPTS_FDS;
obj.binder = 0; /* Don't pass uninitialized stack data to a remote process */
obj.handle = handle;
@@ -219,12 +219,12 @@
obj.flags = priority & FLAT_BINDER_FLAG_PRIORITY_MASK;
obj.flags |= FLAT_BINDER_FLAG_ACCEPTS_FDS | FLAT_BINDER_FLAG_INHERIT_RT;
obj.flags |= (policy & 3) << FLAT_BINDER_FLAG_SCHEDPOLICY_SHIFT;
- obj.type = BINDER_TYPE_BINDER;
+ obj.hdr.type = BINDER_TYPE_BINDER;
obj.binder = reinterpret_cast<uintptr_t>(local->getWeakRefs());
obj.cookie = reinterpret_cast<uintptr_t>(local);
}
} else {
- obj.type = BINDER_TYPE_BINDER;
+ obj.hdr.type = BINDER_TYPE_BINDER;
obj.binder = 0;
obj.cookie = 0;
}
@@ -248,12 +248,12 @@
ALOGE("null proxy");
}
const int32_t handle = proxy ? proxy->handle() : 0;
- obj.type = BINDER_TYPE_WEAK_HANDLE;
+ obj.hdr.type = BINDER_TYPE_WEAK_HANDLE;
obj.binder = 0; /* Don't pass uninitialized stack data to a remote process */
obj.handle = handle;
obj.cookie = 0;
} else {
- obj.type = BINDER_TYPE_WEAK_BINDER;
+ obj.hdr.type = BINDER_TYPE_WEAK_BINDER;
obj.binder = reinterpret_cast<uintptr_t>(binder.get_refs());
obj.cookie = reinterpret_cast<uintptr_t>(binder.unsafe_get());
}
@@ -268,13 +268,13 @@
// but we can't do that with the different reference counting
// implementation we are using.
ALOGE("Unable to unflatten Binder weak reference!");
- obj.type = BINDER_TYPE_BINDER;
+ obj.hdr.type = BINDER_TYPE_BINDER;
obj.binder = 0;
obj.cookie = 0;
return finish_flatten_binder(NULL, obj, out);
} else {
- obj.type = BINDER_TYPE_BINDER;
+ obj.hdr.type = BINDER_TYPE_BINDER;
obj.binder = 0;
obj.cookie = 0;
return finish_flatten_binder(NULL, obj, out);
@@ -294,7 +294,7 @@
const flat_binder_object* flat = in.readObject<flat_binder_object>();
if (flat) {
- switch (flat->type) {
+ switch (flat->hdr.type) {
case BINDER_TYPE_BINDER:
*out = reinterpret_cast<IBinder*>(flat->cookie);
return finish_unflatten_binder(NULL, *flat, in);
@@ -313,7 +313,7 @@
const flat_binder_object* flat = in.readObject<flat_binder_object>();
if (flat) {
- switch (flat->type) {
+ switch (flat->hdr.type) {
case BINDER_TYPE_BINDER:
*out = reinterpret_cast<IBinder*>(flat->cookie);
return finish_unflatten_binder(NULL, *flat, in);
@@ -339,12 +339,12 @@
/*
* Return true iff:
* 1. obj is indeed a binder_buffer_object (type is BINDER_TYPE_PTR), and
- * 2. obj does NOT have the flag BINDER_BUFFER_REF (it is not a reference, but
+ * 2. obj does NOT have the flag BINDER_BUFFER_FLAG_REF (it is not a reference, but
* an actual buffer.)
*/
static inline bool isBuffer(const binder_buffer_object& obj) {
return obj.hdr.type == BINDER_TYPE_PTR
- && (obj.flags & BINDER_BUFFER_REF) == 0;
+ && (obj.flags & BINDER_BUFFER_FLAG_REF) == 0;
}
// ---------------------------------------------------------------------------
@@ -844,7 +844,7 @@
obj.hdr.type = BINDER_TYPE_PTR;
obj.buffer = reinterpret_cast<binder_uintptr_t>(buffer);
obj.length = length;
- obj.flags = BINDER_BUFFER_HAS_PARENT;
+ obj.flags = BINDER_BUFFER_FLAG_HAS_PARENT;
if(!validateBufferParent(parent_buffer_handle, parent_offset))
return BAD_VALUE;
obj.parent = parent_buffer_handle;
@@ -888,11 +888,13 @@
return status;
binder_buffer_object obj;
obj.hdr.type = BINDER_TYPE_PTR;
- obj.flags = BINDER_BUFFER_REF;
+ obj.flags = BINDER_BUFFER_FLAG_REF;
if (!validateBufferChild(child_buffer_handle, child_offset))
return BAD_VALUE;
- obj.child = child_buffer_handle;
- obj.child_offset = child_offset;
+ // The current binder.h does not have child and child_offset names yet.
+ // Use the buffer and length parameters.
+ obj.buffer = child_buffer_handle;
+ obj.length = child_offset;
if (handle != nullptr)
// We use an index into mObjects as a handle
*handle = mObjectsSize;
@@ -913,11 +915,13 @@
return status;
binder_buffer_object obj;
obj.hdr.type = BINDER_TYPE_PTR;
- obj.flags = BINDER_BUFFER_REF | BINDER_BUFFER_HAS_PARENT;
+ obj.flags = BINDER_BUFFER_FLAG_REF | BINDER_BUFFER_FLAG_HAS_PARENT;
if (!validateBufferChild(child_buffer_handle, child_offset))
return BAD_VALUE;
- obj.child = child_buffer_handle;
- obj.child_offset = child_offset;
+ // The current binder.h does not have child and child_offset names yet.
+ // Use the buffer and length parameters.
+ obj.buffer = child_buffer_handle;
+ obj.length = child_offset;
if(!validateBufferParent(parent_buffer_handle, parent_offset))
return BAD_VALUE;
obj.parent = parent_buffer_handle;
@@ -936,7 +940,7 @@
return status;
binder_buffer_object obj;
obj.hdr.type = BINDER_TYPE_PTR;
- obj.flags = BINDER_BUFFER_REF;
+ obj.flags = BINDER_BUFFER_FLAG_REF;
if (handle != nullptr)
// We use an index into mObjects as a handle
*handle = mObjectsSize;
@@ -954,7 +958,7 @@
return status;
binder_buffer_object obj;
obj.hdr.type = BINDER_TYPE_PTR;
- obj.flags = BINDER_BUFFER_REF | BINDER_BUFFER_HAS_PARENT;
+ obj.flags = BINDER_BUFFER_FLAG_REF | BINDER_BUFFER_FLAG_HAS_PARENT;
// parent_buffer_handle and parent_offset needs to be checked.
if(!validateBufferParent(parent_buffer_handle, parent_offset))
return BAD_VALUE;
@@ -1540,7 +1544,7 @@
return false;
}
- if (flags & BINDER_BUFFER_HAS_PARENT) {
+ if (flags & BINDER_BUFFER_FLAG_HAS_PARENT) {
if (buffer_obj->parent != parent) {
ALOGE("Buffer parent %" PRIu64 " does not match expected parent %zu.",
static_cast<uint64_t>(buffer_obj->parent), parent);
@@ -1618,7 +1622,7 @@
size_t parent_offset,
const void **buffer_out) const
{
- return readBuffer(buffer_size, buffer_handle, BINDER_BUFFER_HAS_PARENT,
+ return readBuffer(buffer_size, buffer_handle, BINDER_BUFFER_FLAG_HAS_PARENT,
parent_buffer_handle, parent_offset, buffer_out);
}
@@ -1638,7 +1642,7 @@
*buffer_handle = 0; // TODO fix this, as readBuffer would do
}
if(isRef != nullptr) {
- *isRef = (buffer_obj->flags & BINDER_BUFFER_REF) != 0;
+ *isRef = (buffer_obj->flags & BINDER_BUFFER_FLAG_REF) != 0;
LOG_BUFFER(" readReference: isRef = %d", *isRef);
}
// in read side, always use .buffer and .length.
@@ -1765,7 +1769,7 @@
i--;
const flat_binder_object* flat
= reinterpret_cast<flat_binder_object*>(mData+mObjects[i]);
- if (flat->type == BINDER_TYPE_FD) {
+ if (flat->hdr.type == BINDER_TYPE_FD) {
//ALOGI("Closing fd: %ld", flat->handle);
close(flat->handle);
}
@@ -1863,7 +1867,7 @@
for (size_t i=0; i<N; i++) {
const flat_binder_object* flat
= reinterpret_cast<const flat_binder_object*>(DATA+OBJS[i]);
- if (flat->type == BINDER_TYPE_PTR) {
+ if (flat->hdr.type == BINDER_TYPE_PTR) {
const binder_buffer_object* buffer
= reinterpret_cast<const binder_buffer_object*>(DATA+OBJS[i]);
if(isBuffer(*buffer)) {
@@ -1876,7 +1880,7 @@
}
} else {
to << endl << "Object #" << i << " @ " << (void*)OBJS[i] << ": "
- << TypeCode(flat->type & 0x7f7f7f00)
+ << TypeCode(flat->hdr.type & 0x7f7f7f00)
<< " = " << flat->binder;
}
}
@@ -2101,7 +2105,7 @@
for (size_t i=objectsSize; i<mObjectsSize; i++) {
const flat_binder_object* flat
= reinterpret_cast<flat_binder_object*>(mData+mObjects[i]);
- if (flat->type == BINDER_TYPE_FD) {
+ if (flat->hdr.type == BINDER_TYPE_FD) {
// will need to rescan because we may have lopped off the only FDs
mFdsKnown = false;
}
@@ -2214,7 +2218,7 @@
for (size_t i=0; i<mObjectsSize; i++) {
const flat_binder_object* flat
= reinterpret_cast<const flat_binder_object*>(mData + mObjects[i]);
- if (flat->type == BINDER_TYPE_FD) {
+ if (flat->hdr.type == BINDER_TYPE_FD) {
hasFds = true;
break;
}
diff --git a/include/hwbinder/binder_kernel.h b/include/hwbinder/binder_kernel.h
index bf94a57..1d2738c 100644
--- a/include/hwbinder/binder_kernel.h
+++ b/include/hwbinder/binder_kernel.h
@@ -21,66 +21,13 @@
/**
* This file exists because the uapi kernel headers in bionic are built
- * from upstream kernel headers only, and the hwbinder kernel changes
- * haven't made it upstream yet. Therefore, the modifications to the
+ * from upstream kernel headers only, and not all of the hwbinder kernel changes
+ * have made it upstream yet. Therefore, the modifications to the
* binder header are added locally in this file.
*/
enum {
- BINDER_TYPE_PTR = B_PACK_CHARS('p', 't', '*', B_TYPE_LARGE),
- BINDER_TYPE_FDA = B_PACK_CHARS('f', 'd', 'a', B_TYPE_LARGE),
-};
-
-/* This header is used in all binder objects that are fixed
- * up by the kernel driver */
-struct binder_object_header {
- __u32 type;
-};
-
-struct binder_fd_object {
- struct binder_object_header hdr;
- /* FD objects used to be represented in flat_binder_object as well,
- * so we're using pads here to remain compatibile to existing userspace
- * clients.
- */
- __u32 pad_flags;
- union {
- binder_uintptr_t pad_binder;
- __u32 fd;
- };
-
- binder_uintptr_t cookie;
-};
-
-/* A binder_buffer object represents an object that the
- * binder kernel driver copies verbatim to the target
- * address space. A buffer itself may be pointed to from
- * within another buffer, meaning that the pointer inside
- * that other buffer needs to be fixed up as well. This
- * can be done by specifying the parent buffer, and the
- * byte offset at which the pointer lives in that buffer.
- */
-struct binder_buffer_object {
- struct binder_object_header hdr;
- __u32 flags;
-
- union {
- struct {
- binder_uintptr_t buffer; /* Pointer to buffer data */
- binder_size_t length; /* Length of the buffer data */
- };
- struct {
- binder_size_t child; /* index of child in objects array */
- binder_size_t child_offset; /* byte offset in child buffer */
- };
- };
- binder_size_t parent; /* index of parent in objects array */
- binder_size_t parent_offset; /* byte offset of pointer in parent buffer */
-};
-
-enum {
- BINDER_BUFFER_HAS_PARENT = 1U << 0,
- BINDER_BUFFER_REF = 1U << 1,
+ BINDER_BUFFER_FLAG_REF = 1U << 1,
};
/* A binder_fd_array object represents an array of file
@@ -96,16 +43,6 @@
binder_size_t parent_offset; /* offset of pointer in parent */
};
-struct binder_transaction_data_sg {
- binder_transaction_data tr; /* regular transaction data */
- binder_size_t buffers_size; /* number of bytes of SG buffers */
-};
-
-enum {
- BC_TRANSACTION_SG = _IOW('c', 17, struct binder_transaction_data_sg),
- BC_REPLY_SG = _IOW('c', 18, struct binder_transaction_data_sg),
-};
-
enum {
FLAT_BINDER_FLAG_SCHEDPOLICY_MASK = 0x600,
FLAT_BINDER_FLAG_SCHEDPOLICY_SHIFT = 9,
