commit 99666f7a393a2b84a7283e136b9460699be78630
author Arve Hjønnevåg <arve@android.com> Fri Aug 12 16:04:28 2016 -0700
committer Pat Tjin <pattjin@google.com> Tue Aug 23 03:30:37 2016 +0000
tree 42cc06139d9cf1b3501a2f2caa5d60c7be1d2f9f
parent 5e48506ac08d5ff7b0928a540d4c2d28d7ffe950

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

Prevents leaking pointers between processes

BUG: 30768347
Change-Id: Id898076926f658a1b8b27a3ccb848756b36de4ca
Signed-off-by: Arve Hjønnevåg <arve@android.com>

drivers/staging/android/binder.c

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 7161eba..56ffc1c 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -1677,7 +1677,9 @@
 				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);
 
@@ -1723,7 +1725,9 @@
 					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);
@@ -1775,6 +1779,7 @@
 			binder_debug(BINDER_DEBUG_TRANSACTION,
 				     "        fd %ld -> %d\n", fp->handle, target_fd);
 			/* TODO: fput? */
+			fp->binder = 0;
 			fp->handle = target_fd;
 		} break;