From c72e84a2f34a0242842a5dea2e62df5a340048fd Mon Sep 17 00:00:00 2001 From: Pavel Begunkov Date: Wed, 22 Jan 2020 23:09:35 +0300 Subject: [PATCH] io_uring: prep req when do IOSQE_ASYNC to #26323588 commit 1118591ab883f46df4ab614cc976bc4c8e04a464 upstream. Whenever IOSQE_ASYNC is set, requests will be punted to async without getting into io_issue_req() and without proper preparation done (e.g. io_req_defer_prep()). Hence they will be left uninitialised. Prepare them before punting. Signed-off-by: Pavel Begunkov Signed-off-by: Jens Axboe Signed-off-by: Joseph Qi Acked-by: Xiaoguang Wang --- fs/io_uring.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 0b067b8e6e79..e4c919112ce8 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4555,11 +4555,15 @@ static void io_queue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe) ret = io_req_defer(req, sqe); if (ret) { if (ret != -EIOCBQUEUED) { +fail_req: io_cqring_add_event(req, ret); req_set_fail_links(req); io_double_put_req(req); } } else if (req->flags & REQ_F_FORCE_ASYNC) { + ret = io_req_defer_prep(req, sqe); + if (unlikely(ret < 0)) + goto fail_req; /* * Never try inline submit of IOSQE_ASYNC is set, go straight * to async execution. -- GitLab