staging: binder: Fix ABI for 64bit Android

BC_REQUEST_DEATH_NOTIFICATION and BC_CLEAR_DEATH_NOTIFICATION were
defined with the wrong structure that did not match the code. Since a
binder pointer and handle are the same size on 32 bit systems, this
change does not affect them. The two commands claimed they were using
struct binder_ptr_cookie but they are using a 32bit handle and a pointer.

The main purpose of this patch is to add the binder_handle_cookie
struct so the service manager does not have to define its own version
(libbinder writes one field at a time so it does not use the struct).

On 32bit systems the payload size is the same as the size of struct
binder_ptr_cookie. On 64bit systems, the size does differ, and the
ioctl number does change. However, there are no known 64bit users of
this interface, and any 64bit systems will need the following patch to
run 32 bit processes anyway, so it is not expected that anyone will
ship a 64bit system without this change, so this change should not
affect any existing systems.

Cc: Colin Cross <ccross@android.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Serban Constantinescu <serban.constantinescu@arm.com>
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
[jstultz: Few 80+ col fixes for checkpatch, improved commit message
with help from Serban, and included rational from Arve's email]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/uapi/binder.h b/drivers/staging/android/uapi/binder.h
index 2b1eb8106d58e22cb42f61a6aae19f56884376ff..4071fcffa83cc497b59e4bb6c3d3509f5490840e 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,17 @@ 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
         */