ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct

Prevents leaking pointers between processes

Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Martijn Coenen <maco@android.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 3681759c22d7..3c71b982bf2a 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -1584,7 +1584,9 @@ static void binder_transaction(struct binder_proc *proc,
                                 fp->type = BINDER_TYPE_HANDLE;
                         else
                                 fp->type = BINDER_TYPE_WEAK_HANDLE;
+                        fp->binder = 0;
                         fp->handle = ref->desc;
+                        fp->cookie = 0;
                         binder_inc_ref(ref, fp->type == BINDER_TYPE_HANDLE,
                                        &thread->todo);
 
@@ -1634,7 +1636,9 @@ static void binder_transaction(struct binder_proc *proc,
                                         return_error = BR_FAILED_REPLY;
                                         goto err_binder_get_ref_for_node_failed;
                                 }
+                                fp->binder = 0;
                                 fp->handle = new_ref->desc;
+                                fp->cookie = 0;
                                 binder_inc_ref(new_ref, fp->type == BINDER_TYPE_HANDLE, NULL);
                                 trace_binder_transaction_ref_to_ref(t, ref,
                                                                     new_ref);
@@ -1688,6 +1692,7 @@ static void binder_transaction(struct binder_proc *proc,
                         binder_debug(BINDER_DEBUG_TRANSACTION,
                                      "        fd %d -> %d\n", fp->handle, target_fd);
                         /* TODO: fput? */
+                        fp->binder = 0;
                         fp->handle = target_fd;
                 } break;