]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
io_uring: fix possible deadlock in io_register_iowq_max_workers()
authorHagar Hemdan <hagarhem@amazon.com>
Tue, 4 Jun 2024 13:05:27 +0000 (13:05 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Nov 2024 14:06:25 +0000 (15:06 +0100)
commit97ed7ff58de66c544692b3c2b988f3f594348de0
tree33335d0cfface82bd5e8a46d12db0e981385b157
parent1f4fd53ffb7c94e9b961534d4f8763bcbbbb6f8e
io_uring: fix possible deadlock in io_register_iowq_max_workers()

commit 73254a297c2dd094abec7c9efee32455ae875bdf upstream.

The io_register_iowq_max_workers() function calls io_put_sq_data(),
which acquires the sqd->lock without releasing the uring_lock.
Similar to the commit 009ad9f0c6ee ("io_uring: drop ctx->uring_lock
before acquiring sqd->lock"), this can lead to a potential deadlock
situation.

To resolve this issue, the uring_lock is released before calling
io_put_sq_data(), and then it is re-acquired after the function call.

This change ensures that the locks are acquired in the correct
order, preventing the possibility of a deadlock.

Suggested-by: Maximilian Heyne <mheyne@amazon.de>
Signed-off-by: Hagar Hemdan <hagarhem@amazon.com>
Link: https://lore.kernel.org/r/20240604130527.3597-1-hagarhem@amazon.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
io_uring/io_uring.c