diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-05 05:31:41 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-05 05:31:41 -1000 |
| commit | fe5881ed7293813e492ad165292ae652b676ff6c (patch) | |
| tree | bdc08c6d0aa58c69e21e7feebb5d86623c07aaab /kernel | |
| parent | 610533cb3bd0aba501d14552c3bf1485eb427455 (diff) | |
| parent | 39def6d250d370298f86c116f4ac60093cefadaa (diff) | |
| download | linux-next-fe5881ed7293813e492ad165292ae652b676ff6c.tar.gz linux-next-fe5881ed7293813e492ad165292ae652b676ff6c.zip | |
Merge tag 'locking-urgent-2026-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull futex fix from Ingo Molnar:
- Fix a futex-requeue deadlock detection regression (Thomas Gleixner)
* tag 'locking-urgent-2026-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex/requeue: Revert "Prevent NULL pointer dereference in remove_waiter() on self-deadlock""
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex/requeue.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c index 7384672916fb..79823ad13683 100644 --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -645,12 +645,6 @@ retry_private: continue; } - /* Self-deadlock: non-top waiter already owns the PI futex. */ - if (rt_mutex_owner(&pi_state->pi_mutex) == this->task) { - ret = -EDEADLK; - break; - } - ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex, this->rt_waiter, this->task); |