diff options
| author | Arve Hjønnevåg <arve@android.com> | 2016-08-12 16:04:28 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2016-08-19 23:30:11 +0000 |
| commit | 9bf0af9af863fb64a98e1cde855be8844b53c1ed (patch) | |
| tree | c21e24d114d9ef3311805aef2a09fdc06eedf998 | |
| parent | fad3cb3a344633142581b200b2f31189d875c40a (diff) | |
| download | tegra-9bf0af9af863fb64a98e1cde855be8844b53c1ed.tar.gz | |
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>
| -rw-r--r-- | drivers/android/binder.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 4a8249393f92..883733077ab3 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -1654,7 +1654,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); @@ -1701,7 +1703,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); @@ -1753,6 +1757,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; |