evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Prevents leaking pointers between processes

BUG: 30768347
Change-Id: Id898076926f658a1b8b27a3ccb848756b36de4ca
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Git-repo: https://android.googlesource.com/kernel/msm.git
Git-commit: 11032d745836280574827bb1db5e64a94945180e
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
This commit is contained in:
Arve Hjønnevåg 2016-10-17 23:51:11 +05:30 • committed by Gerrit - the friendly Code Review server
parent 85d7e134cc
commit 580f1555aa
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/android/binder.c
View file

@ -1649,7 +1649,9 @@ static void binder_transaction(struct binder_proc *proc,
fp->type = BINDER_TYPE_HANDLE; fp->type = BINDER_TYPE_HANDLE;
else else
fp->type = BINDER_TYPE_WEAK_HANDLE; fp->type = BINDER_TYPE_WEAK_HANDLE;
fp->binder = 0;
fp->handle = ref->desc; fp->handle = ref->desc;
fp->cookie = 0;
binder_inc_ref(ref, fp->type == BINDER_TYPE_HANDLE, binder_inc_ref(ref, fp->type == BINDER_TYPE_HANDLE,
&thread->todo); &thread->todo);
@ -1696,7 +1698,9 @@ static void binder_transaction(struct binder_proc *proc,
return_error = BR_FAILED_REPLY; return_error = BR_FAILED_REPLY;
goto err_binder_get_ref_for_node_failed; goto err_binder_get_ref_for_node_failed;
} }
fp->binder = 0;
fp->handle = new_ref->desc; fp->handle = new_ref->desc;
fp->cookie = 0;
binder_inc_ref(new_ref, fp->type == BINDER_TYPE_HANDLE, NULL); binder_inc_ref(new_ref, fp->type == BINDER_TYPE_HANDLE, NULL);
trace_binder_transaction_ref_to_ref(t, ref, trace_binder_transaction_ref_to_ref(t, ref,
new_ref); new_ref);
@ -1750,6 +1754,7 @@ static void binder_transaction(struct binder_proc *proc,
binder_debug(BINDER_DEBUG_TRANSACTION, binder_debug(BINDER_DEBUG_TRANSACTION,
" fd %d -> %d\n", fp->handle, target_fd); " fd %d -> %d\n", fp->handle, target_fd);
/* TODO: fput? */ /* TODO: fput? */
fp->binder = 0;
fp->handle = target_fd; fp->handle = target_fd;
} break; } break;