[PATCH] io_uring: fix io_prep_async_link locking

[PATCH] io_uring: fix io_prep_async_link locking

[Pavel Begunkov]

io_prep_async_link() may be called after arming a linked timeout,
automatically making it unsafe to traverse the linked list. Guard
with completion_lock if there was a linked timeout.

Cc: stable@vger.kernel.org # 5.9+
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 fs/io_uring.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 7d995d97beeb..6c2cc374a2a5 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1279,8 +1279,17 @@ static void io_prep_async_link(struct io_kiocb *req)
 {
 	struct io_kiocb *cur;
 
-	io_for_each_link(cur, req)
-		io_prep_async_work(cur);
+	if (req->flags & REQ_F_LINK_TIMEOUT) {
+		struct io_ring_ctx *ctx = req->ctx;
+
+		spin_lock_irq(&ctx->completion_lock);
+		io_for_each_link(cur, req)
+			io_prep_async_work(cur);
+		spin_unlock_irq(&ctx->completion_lock);
+	} else {
+		io_for_each_link(cur, req)
+			io_prep_async_work(cur);
+	}
 }
 
 static void io_queue_async_work(struct io_kiocb *req)
-- 
2.32.0

Re: [PATCH] io_uring: fix io_prep_async_link locking

[Jens Axboe]

On 7/26/21 7:14 AM, Pavel Begunkov wrote:
> io_prep_async_link() may be called after arming a linked timeout,
> automatically making it unsafe to traverse the linked list. Guard
> with completion_lock if there was a linked timeout.

Don't seem to have emailed this out, but I did apply this the other
day. Thanks!

-- 
Jens Axboe