futex/requeue: Prevent NULL pointer dereference in remove_waiter() on self-deadlock
authorJi'an Zhou <eilaimemedsnaimel@gmail.com>
Tue, 2 Jun 2026 09:12:04 +0000 (09:12 +0000)
committerThomas Gleixner <tglx@kernel.org>
Tue, 2 Jun 2026 20:27:04 +0000 (22:27 +0200)
commit74e144274af39935b0f410c0ee4d2b91c3730414
treed342727d2f614c47d7d279c6fab7d754cb3535c2
parente43ffb69e0438cddd72aaa30898b4dc446f664f8
futex/requeue: Prevent NULL pointer dereference in remove_waiter() on self-deadlock

When FUTEX_CMP_REQUEUE_PI requeues a non-top waiter that already owns the
target PI futex, task_blocks_on_rt_mutex() returns -EDEADLK before setting
waiter->task.

The subsequent remove_waiter() in rt_mutex_start_proxy_lock() dereferences
the NULL waiter->task, causing a kernel crash.

Add a self-deadlock check for non-top waiters before calling
rt_mutex_start_proxy_lock(), analogous to the top-waiter check in
futex_lock_pi_atomic().

Fixes: 3bfdc63936dd4773109b7b8c280c0f3b5ae7d349 ("rtmutex: Use waiter::task instead of current in remove_waiter()")
Signed-off-by: Ji'an Zhou <eilaimemedsnaimel@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: stable@vger.kernel.org
kernel/futex/requeue.c