Skip to content

Commit 73254a2

Browse files
hagarhemaxboe
authored andcommitted
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 009ad9f ("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>
1 parent 91215f7 commit 73254a2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

io_uring/register.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,10 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx,
355355
}
356356

357357
if (sqd) {
358+
mutex_unlock(&ctx->uring_lock);
358359
mutex_unlock(&sqd->lock);
359360
io_put_sq_data(sqd);
361+
mutex_lock(&ctx->uring_lock);
360362
}
361363

362364
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,
380382
return 0;
381383
err:
382384
if (sqd) {
385+
mutex_unlock(&ctx->uring_lock);
383386
mutex_unlock(&sqd->lock);
384387
io_put_sq_data(sqd);
388+
mutex_lock(&ctx->uring_lock);
385389
}
386390
return ret;
387391
}

0 commit comments

Comments
 (0)