]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
rtmutex: Use waiter::task instead of current in remove_waiter()
authorKeenan Dong <keenanat2000@gmail.com>
Wed, 8 Apr 2026 08:46:00 +0000 (16:46 +0800)
committerThomas Gleixner <tglx@kernel.org>
Mon, 20 Apr 2026 22:22:31 +0000 (00:22 +0200)
commit3bfdc63936dd4773109b7b8c280c0f3b5ae7d349
treee3d481b4426ed9caca210f6c08763b334a52457c
parentc1f49dea2b8f335813d3b348fd39117fb8efb428
rtmutex: Use waiter::task instead of current in remove_waiter()

remove_waiter() is used by the slowlock paths, but it is also used for
proxy-lock rollback in rt_mutex_start_proxy_lock() when invoked from
futex_requeue().

In the latter case waiter::task is not current, but remove_waiter()
operates on current for the dequeue operation. That results in several
problems:

  1) the rbtree dequeue happens without waiter::task::pi_lock being held

  2) the waiter task's pi_blocked_on state is not cleared, which leaves a
     dangling pointer primed for UAF around.

  3) rt_mutex_adjust_prio_chain() operates on the wrong top priority waiter
     task

Use waiter::task instead of current in all related operations in
remove_waiter() to cure those problems.

[ tglx: Fixup rt_mutex_adjust_prio_chain(), add a comment and amend the
   changelog ]

Fixes: 8161239a8bcc ("rtmutex: Simplify PI algorithm and make highest prio task get lock")
Reported-by: Yuan Tan <yuantan098@gmail.com>
Reported-by: Yifan Wu <yifanwucs@gmail.com>
Reported-by: Juefei Pu <tomapufckgml@gmail.com>
Reported-by: Xin Liu <bird@lzu.edu.cn>
Signed-off-by: Keenan Dong <keenanat2000@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: stable@vger.kernel.org
kernel/locking/rtmutex.c