diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-12-02 17:47:22 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-12-31 13:33:12 +0100 |
| commit | 9b5d3f21f1aba54064f8f56694d09ee8d91daec3 (patch) | |
| tree | 4ab316e3c719398f7c72ed5da7c1152b9fea2452 /io_uring | |
| parent | f9ef51a7055cb1abd4b58d2a8fcb87db0a58ccf2 (diff) | |
| download | linux-stable-9b5d3f21f1aba54064f8f56694d09ee8d91daec3.tar.gz linux-stable-9b5d3f21f1aba54064f8f56694d09ee8d91daec3.tar.bz2 linux-stable-9b5d3f21f1aba54064f8f56694d09ee8d91daec3.zip | |
io_uring: protect cq_timeouts with timeout_lock
commit ea011ee10231f5fa6cbb415007048ca0bb948baf upstream.
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: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/9c79544dd6cf5c4018cb1bab99cf481a93ea46ef.1670002973.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/timeout.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/io_uring/timeout.c b/io_uring/timeout.c index e8a8c2099480..06200fe73a04 100644 --- a/io_uring/timeout.c +++ b/io_uring/timeout.c @@ -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; |