staging: android: binder: fix ABI for 64bit Android

This patch fixes the ABI for 64bit Android userspace.
BC_REQUEST_DEATH_NOTIFICATION and BC_CLEAR_DEATH_NOTIFICATION claim
to be using struct binder_ptr_cookie, but they are using a 32bit handle
and a pointer.

On 32bit systems the payload size is the same as the size of struct
binder_ptr_cookie, however for 64bit systems this will differ. This
patch adds struct binder_handle_cookie that fixes this issue for 64bit
Android.

Since there are no 64bit users of this interface that we know of this
change should not affect any existing systems.

Change-Id: I8909cbc50aad48ccf371270bad6f69ff242a8c22
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>

diff --git a/drivers/staging/android/uapi/binder.h b/drivers/staging/android/uapi/binder.h
index e76cfa876daa9491aaaa33ff7c1d8ef3c73c42c2..008722a249bc0ed865d3ca814cea079c9e1baf1c 100644 (file)
--- a/drivers/staging/android/uapi/binder.h
+++ b/drivers/staging/android/uapi/binder.h
@@ -152,6 +152,11 @@ struct binder_ptr_cookie {
        void *cookie;
 };
 
+struct binder_handle_cookie {
+       __u32 handle;
+       void *cookie;
+} __attribute__((packed));
+
 struct binder_pri_desc {
        __s32 priority;
        __u32 desc;
@@ -308,15 +313,15 @@ enum binder_driver_command_protocol {
         * of looping threads it has available.
         */
 
-       BC_REQUEST_DEATH_NOTIFICATION = _IOW('c', 14, struct binder_ptr_cookie),
+       BC_REQUEST_DEATH_NOTIFICATION = _IOW('c', 14, struct binder_handle_cookie),
        /*
-        * void *: ptr to binder
+        * int: handle
         * void *: cookie
         */
 
-       BC_CLEAR_DEATH_NOTIFICATION = _IOW('c', 15, struct binder_ptr_cookie),
+       BC_CLEAR_DEATH_NOTIFICATION = _IOW('c', 15, struct binder_handle_cookie),
        /*
-        * void *: ptr to binder
+        * int: handle
         * void *: cookie
         */