Evolution-X-Devices/kernel_google_wahoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

binder: return BR_DEAD_REPLY if target proc is dying

Browse Source 
With fine-grained locking, there have been noisy error
messages resulting from binder transactions to procs
that are dead or dying. The correct error response for
these cases is BR_DEAD_REPLY, but since some of these
cases couldn't be hit before, BR_FAILED_REPLY is being
returned resulting in misleading log messages.

Check whether the target is dying before attempting a
transaction and return BR_DEAD_REPLY if it is.

Bug: 35042927
Change-Id: I4fb3717eb8fa931fa7acb34a49829fcc096f2c44
Test: tested manually
Signed-off-by: Todd Kjos <tkjos@google.com>
This commit is contained in:
Todd Kjos
2017-02-15 09:56:12 -08:00
committed by Thierry Strudel
parent 6956e166c1
commit b31b594bd1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/android/binder.c
View File

@@ -1372,7 +1372,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
fp = to_flat_binder_object(hdr);
node = binder_get_node(proc, fp->binder);
if (node == NULL) {
pr_err("transaction release %d bad node %016llx\n",
pr_err("transaction release %d bad node %016llx, target died\n",
debug_id, (u64)fp->binder);
break;
}
@@ -1392,7 +1392,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
ref = binder_get_ref(proc, fp->handle,
hdr->type == BINDER_TYPE_HANDLE);
if (ref == NULL) {
pr_err("transaction release %d bad handle %d\n",
pr_err("transaction release %d bad handle %d, target died\n",
debug_id, fp->handle);
break;
}
@@ -1944,7 +1944,8 @@ static void binder_transaction(struct binder_proc *proc,
!reply && (t->flags & TF_ONE_WAY));
binder_lock(__func__);
if (t->buffer == NULL) {
return_error = BR_FAILED_REPLY;
return_error = !(target_proc->tsk->flags & PF_EXITING) ?
BR_FAILED_REPLY : BR_DEAD_REPLY;
goto err_binder_alloc_buf_failed;
}
t->buffer->allow_user_free = 0;
@@ -3170,7 +3171,7 @@ static void binder_release_work(struct binder_worklist *wlist)
binder_stats_deleted(BINDER_STAT_DEATH);
} break;
case BINDER_WORK_NODE:
pr_info("unfinished BINDER_WORK_NODE\n");
pr_info("unfinished BINDER_WORK_NODE, proc has died\n");
break;
default:
pr_err("unexpected work type, %d, not freed\n",