Skip to content

Commit 70f060f

Browse files
author
Carlos Llamas
committed
FROMLIST: binder: fix UAF of ref->proc caused by race condition
A transaction of type BINDER_TYPE_WEAK_HANDLE can fail to increment the reference for a node. In this case, the target proc normally releases the failed reference upon close as expected. However, if the target is dying in parallel the call will race with binder_deferred_release(), so the target could have released all of its references by now leaving the cleanup of the new failed reference unhandled. The transaction then ends and the target proc gets released making the ref->proc now a dangling pointer. Later on, ref->node is closed and we attempt to take spin_lock(&ref->proc->inner_lock), which leads to the use-after-free bug reported below. Let's fix this by cleaning up the failed reference on the spot instead of relying on the target to do so. ================================================================== BUG: KASAN: use-after-free in _raw_spin_lock+0xa8/0x150 Write of size 4 at addr ffff5ca207094238 by task kworker/1:0/590 CPU: 1 PID: 590 Comm: kworker/1:0 Not tainted 5.19.0-rc8 #10 Hardware name: linux,dummy-virt (DT) Workqueue: events binder_deferred_func Call trace: dump_backtrace.part.0+0x1d0/0x1e0 show_stack+0x18/0x70 dump_stack_lvl+0x68/0x84 print_report+0x2e4/0x61c kasan_report+0xa4/0x110 kasan_check_range+0xfc/0x1a4 __kasan_check_write+0x3c/0x50 _raw_spin_lock+0xa8/0x150 binder_deferred_func+0x5e0/0x9b0 process_one_work+0x38c/0x5f0 worker_thread+0x9c/0x694 kthread+0x188/0x190 ret_from_fork+0x10/0x20 Signed-off-by: Carlos Llamas <cmllamas@google.com> Acked-by: Christian Brauner (Microsoft) <brauner@kernel.org> Bug: 239630375 Link: https://lore.kernel.org/all/20220801182511.3371447-1-cmllamas@google.com/ Signed-off-by: Carlos Llamas <cmllamas@google.com> Change-Id: I5085dd0dc805a780a64c057e5819f82dd8f02868 (cherry picked from commit ae3fa5d)
1 parent 88e3492 commit 70f060f

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

drivers/android/binder.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,6 +1940,18 @@ static int binder_inc_ref_for_node(struct binder_proc *proc,
19401940
}
19411941
ret = binder_inc_ref_olocked(ref, strong, target_list);
19421942
*rdata = ref->data;
1943+
if (ret && ref == new_ref) {
1944+
/*
1945+
* Cleanup the failed reference here as the target
1946+
* could now be dead and have already released its
1947+
* references by now. Calling on the new reference
1948+
* with strong=0 and a tmp_refs will not decrement
1949+
* the node. The new_ref gets kfree'd below.
1950+
*/
1951+
binder_cleanup_ref_olocked(new_ref);
1952+
ref = NULL;
1953+
}
1954+
19431955
binder_proc_unlock(proc);
19441956
if (new_ref && ref != new_ref)
19451957
/*

0 commit comments

Comments
 (0)