Commit ea011ee1 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: protect cq_timeouts with timeout_lock 



Read cq_timeouts in io_flush_timeouts() only after taking the
timeout_lock, as it's protected by it. There are many places where we
also grab ->completion_lock, but for instance io_timeout_fn() doesn't
and still modifies cq_timeouts.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/9c79544dd6cf5c4018cb1bab99cf481a93ea46ef.1670002973.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e2ca6ba6

io_uring/timeout.c

+3 −1
Original line number Diff line number Diff line
@@ -72,10 +72,12 @@ static bool io_kill_timeout(struct io_kiocb *req, int status) 
__cold void io_flush_timeouts(struct io_ring_ctx *ctx)

	__must_hold(&ctx->completion_lock)

{

	u32 seq = ctx->cached_cq_tail - atomic_read(&ctx->cq_timeouts);

	u32 seq;

	struct io_timeout *timeout, *tmp;



	spin_lock_irq(&ctx->timeout_lock);

	seq = ctx->cached_cq_tail - atomic_read(&ctx->cq_timeouts);



	list_for_each_entry_safe(timeout, tmp, &ctx->timeout_list, list) {

		struct io_kiocb *req = cmd_to_io_kiocb(timeout);

		u32 events_needed, events_got;