Commit cf109604 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: don't submit link on error

If we get an error in io_init_req() for a request that would have been
linked, we break the submission but still issue a partially composed
link, that's nasty, fail it instead.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a1ab7b35
...@@ -6763,6 +6763,9 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, ...@@ -6763,6 +6763,9 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
fail_req: fail_req:
io_put_req(req); io_put_req(req);
io_req_complete(req, ret); io_req_complete(req, ret);
/* fail even hard links since we don't submit */
if (link->head)
link->head->flags |= REQ_F_FAIL_LINK;
return ret; return ret;
} }
...@@ -6791,11 +6794,8 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, ...@@ -6791,11 +6794,8 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
ctx->drain_next = 1; ctx->drain_next = 1;
} }
ret = io_req_defer_prep(req, sqe); ret = io_req_defer_prep(req, sqe);
if (unlikely(ret)) { if (unlikely(ret))
/* fail even hard links since we don't submit */
head->flags |= REQ_F_FAIL_LINK;
goto fail_req; goto fail_req;
}
trace_io_uring_link(ctx, req, head); trace_io_uring_link(ctx, req, head);
link->last->link = req; link->last->link = req;
link->last = req; link->last = req;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment