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 /io_uring | |
| 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 'io_uring')
| -rw-r--r-- | io_uring/futex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/futex.c b/io_uring/futex.c index 3159a2b7eeca..43e2143255f5 100644 --- a/io_uring/futex.c +++ b/io_uring/futex.c @@ -338,7 +338,7 @@ int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags) hlist_add_head(&req->hash_node, &ctx->futex_list); io_ring_submit_unlock(ctx, issue_flags); - futex_queue(&ifd->q, hb); + futex_queue(&ifd->q, hb, NULL); return IOU_ISSUE_SKIP_COMPLETE; } |