Commit 73254a29 authored by Hagar Hemdan's avatar Hagar Hemdan Committed by Jens Axboe

io_uring: fix possible deadlock in io_register_iowq_max_workers()

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 009ad9f0 ("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: default avatarMaximilian Heyne <mheyne@amazon.de>
Signed-off-by: default avatarHagar Hemdan <hagarhem@amazon.com>
Link: https://lore.kernel.org/r/20240604130527.3597-1-hagarhem@amazon.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 91215f70
...@@ -355,8 +355,10 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx, ...@@ -355,8 +355,10 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx,
} }
if (sqd) { if (sqd) {
mutex_unlock(&ctx->uring_lock);
mutex_unlock(&sqd->lock); mutex_unlock(&sqd->lock);
io_put_sq_data(sqd); io_put_sq_data(sqd);
mutex_lock(&ctx->uring_lock);
} }
if (copy_to_user(arg, new_count, sizeof(new_count))) if (copy_to_user(arg, new_count, sizeof(new_count)))
...@@ -380,8 +382,10 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx, ...@@ -380,8 +382,10 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx,
return 0; return 0;
err: err:
if (sqd) { if (sqd) {
mutex_unlock(&ctx->uring_lock);
mutex_unlock(&sqd->lock); mutex_unlock(&sqd->lock);
io_put_sq_data(sqd); io_put_sq_data(sqd);
mutex_lock(&ctx->uring_lock);
} }
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment