Skip to content

Commit 38fbefe

Browse files
Carlos Llamasgregkh
Carlos Llamas
authored andcommitted
binder: fix node UAF in binder_add_freeze_work()
commit dc8aea4 upstream. In binder_add_freeze_work() we iterate over the proc->nodes with the proc->inner_lock held. However, this lock is temporarily dropped in order to acquire the node->lock first (lock nesting order). This can race with binder_node_release() and trigger a use-after-free: ================================================================== BUG: KASAN: slab-use-after-free in _raw_spin_lock+0xe4/0x19c Write of size 4 at addr ffff53c04c29dd04 by task freeze/640 CPU: 5 UID: 0 PID: 640 Comm: freeze Not tainted 6.11.0-07343-ga727812a8d45 #17 Hardware name: linux,dummy-virt (DT) Call trace: _raw_spin_lock+0xe4/0x19c binder_add_freeze_work+0x148/0x478 binder_ioctl+0x1e70/0x25ac __arm64_sys_ioctl+0x124/0x190 Allocated by task 637: __kmalloc_cache_noprof+0x12c/0x27c binder_new_node+0x50/0x700 binder_transaction+0x35ac/0x6f74 binder_thread_write+0xfb8/0x42a0 binder_ioctl+0x18f0/0x25ac __arm64_sys_ioctl+0x124/0x190 Freed by task 637: kfree+0xf0/0x330 binder_thread_read+0x1e88/0x3a68 binder_ioctl+0x16d8/0x25ac __arm64_sys_ioctl+0x124/0x190 ================================================================== Fix the race by taking a temporary reference on the node before releasing the proc->inner lock. This ensures the node remains alive while in use. Fixes: d579b04 ("binder: frozen notification") Cc: [email protected] Reviewed-by: Alice Ryhl <[email protected]> Acked-by: Todd Kjos <[email protected]> Signed-off-by: Carlos Llamas <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ac04ef4 commit 38fbefe

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

Diff for: drivers/android/binder.c

+7
Original file line numberDiff line numberDiff line change
@@ -5552,6 +5552,7 @@ static bool binder_txns_pending_ilocked(struct binder_proc *proc)
55525552

55535553
static void binder_add_freeze_work(struct binder_proc *proc, bool is_frozen)
55545554
{
5555+
struct binder_node *prev = NULL;
55555556
struct rb_node *n;
55565557
struct binder_ref *ref;
55575558

@@ -5560,7 +5561,10 @@ static void binder_add_freeze_work(struct binder_proc *proc, bool is_frozen)
55605561
struct binder_node *node;
55615562

55625563
node = rb_entry(n, struct binder_node, rb_node);
5564+
binder_inc_node_tmpref_ilocked(node);
55635565
binder_inner_proc_unlock(proc);
5566+
if (prev)
5567+
binder_put_node(prev);
55645568
binder_node_lock(node);
55655569
hlist_for_each_entry(ref, &node->refs, node_entry) {
55665570
/*
@@ -5586,10 +5590,13 @@ static void binder_add_freeze_work(struct binder_proc *proc, bool is_frozen)
55865590
}
55875591
binder_inner_proc_unlock(ref->proc);
55885592
}
5593+
prev = node;
55895594
binder_node_unlock(node);
55905595
binder_inner_proc_lock(proc);
55915596
}
55925597
binder_inner_proc_unlock(proc);
5598+
if (prev)
5599+
binder_put_node(prev);
55935600
}
55945601

55955602
static int binder_ioctl_freeze(struct binder_freeze_info *info,

0 commit comments

Comments
 (0)