Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit f66b6ef

Browse files
author
Carlos Llamas
committed
FROMGIT: binder: fix node UAF in binder_add_freeze_work()
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]> Bug: 366003708 (cherry picked from commit dc8aea4 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc-next) Change-Id: I47b053532dd4cd3424d35d6f254ca4d00c426411 Signed-off-by: Carlos Llamas <[email protected]>
1 parent 0061c68 commit f66b6ef

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/android/binder.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5804,6 +5804,7 @@ static bool binder_txns_pending_ilocked(struct binder_proc *proc)
58045804

58055805
static void binder_add_freeze_work(struct binder_proc *proc, bool is_frozen)
58065806
{
5807+
struct binder_node *prev = NULL;
58075808
struct rb_node *n;
58085809
struct binder_ref *ref;
58095810

@@ -5812,7 +5813,10 @@ static void binder_add_freeze_work(struct binder_proc *proc, bool is_frozen)
58125813
struct binder_node *node;
58135814

58145815
node = rb_entry(n, struct binder_node, rb_node);
5816+
binder_inc_node_tmpref_ilocked(node);
58155817
binder_inner_proc_unlock(proc);
5818+
if (prev)
5819+
binder_put_node(prev);
58165820
binder_node_lock(node);
58175821
hlist_for_each_entry(ref, &node->refs, node_entry) {
58185822
/*
@@ -5838,10 +5842,13 @@ static void binder_add_freeze_work(struct binder_proc *proc, bool is_frozen)
58385842
}
58395843
binder_inner_proc_unlock(ref->proc);
58405844
}
5845+
prev = node;
58415846
binder_node_unlock(node);
58425847
binder_inner_proc_lock(proc);
58435848
}
58445849
binder_inner_proc_unlock(proc);
5850+
if (prev)
5851+
binder_put_node(prev);
58455852
}
58465853

58475854
static int binder_ioctl_freeze(struct binder_freeze_info *info,

0 commit comments

Comments
 (0)