diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-08 10:54:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-08 10:54:11 -0800 |
| commit | fa76887bb72ae11347730271e6a04c147b7527e6 (patch) | |
| tree | 7dd8f2d7b6de1b164f077c6404f2fed4ac1298ac /kernel/futex/waitwake.c | |
| parent | 8f6629c004b193d23612641c3607e785819e97ab (diff) | |
| parent | 5e0e02f0d7e52cfc8b1adfc778dd02181d8b47b4 (diff) | |
| download | linux-fa76887bb72ae11347730271e6a04c147b7527e6.tar.gz linux-fa76887bb72ae11347730271e6a04c147b7527e6.tar.bz2 linux-fa76887bb72ae11347730271e6a04c147b7527e6.zip | |
Merge tag 'locking-urgent-2025-02-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fix from Ingo Molnar:
"Fix a dangling pointer bug in the futex code used by the uring code.
It isn't causing problems at the moment due to uring ABI limitations
leaving it essentially unused in current usages, but is a good idea to
fix nevertheless"
* tag 'locking-urgent-2025-02-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex: Pass in task to futex_queue()
Diffstat (limited to 'kernel/futex/waitwake.c')
| -rw-r--r-- | kernel/futex/waitwake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index eb86a7ade06a..25877d4f2f8f 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -349,7 +349,7 @@ void futex_wait_queue(struct futex_hash_bucket *hb, struct futex_q *q, * access to the hash list and forcing another memory barrier. */ set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE); - futex_queue(q, hb); + futex_queue(q, hb, current); /* Arm the timer */ if (timeout) @@ -460,7 +460,7 @@ retry: * next futex. Queue each futex at this moment so hb can * be unlocked. */ - futex_queue(q, hb); + futex_queue(q, hb, current); continue; } |