]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
futex/requeue: Revert "Prevent NULL pointer dereference in remove_waiter() on self...
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Wed, 1 Jul 2026 13:11:50 +0000 (15:11 +0200)
committerThomas Gleixner <tglx@kernel.org>
Thu, 2 Jul 2026 20:14:08 +0000 (22:14 +0200)
commit39def6d250d370298f86c116f4ac60093cefadaa
tree15c127d32c09f9099a5b1d8f01ff4ba317297e75
parentdc59e4fea9d83f03bad6bddf3fa2e52491777482
futex/requeue: Revert "Prevent NULL pointer dereference in remove_waiter() on self-deadlock""

The commit cited below should not have been merged. It attemted to fix an
existing problem ansd thereby introduced new problems by keeping the
pi_state in state Q_REQUEUE_PI_IN_PROGRESS and leaking it.

Based on the commit description the intention was to handle the case
when task_blocks_on_rt_mutex() returns -EDEADLK and the following
remove_waiter() dereferences the NULL pointer in waiter->task.

That is already handled by Davidlohr in commit 40a25d59e85b3
("locking/rtmutex: Skip remove_waiter() when waiter is not enqueued") and
requires no further acting.

Revert the commit breaking the "waiter == owner" case again.

Fixes: 74e144274af39 ("futex/requeue: Prevent NULL pointer dereference in remove_waiter() on self-deadlock")
Reported-by: Michael Bommarito <michael.bommarito@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260701131150.0Ijhq4Dw@linutronix.de
Closes: https://lore.kernel.org/all/20260629020049.2082397-1-michael.bommarito@gmail.com
kernel/futex/requeue.c