io_uring: fix io_req_prep_async with provided buffers
io_req_prep_async() can import provided buffers, commit the ring state by giving up on that before, it'll be reimported later if needed. Reported-by: Muhammad Ramdhan <ramdhan@starlabs.sg> Reported-by: Bing-Jhong Billy Jheng <billy@starlabs.sg> Reported-by: Jacob Soo <jacob.soo@starlabs.sg> Fixes: c7fb19428d67d ("io_uring: add support for ring mapped supplied buffers") Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
233b210a67
commit
a1b17713b3
@ -1624,6 +1624,7 @@ bool io_alloc_async_data(struct io_kiocb *req)
|
|||||||
int io_req_prep_async(struct io_kiocb *req)
|
int io_req_prep_async(struct io_kiocb *req)
|
||||||
{
|
{
|
||||||
const struct io_op_def *def = &io_op_defs[req->opcode];
|
const struct io_op_def *def = &io_op_defs[req->opcode];
|
||||||
|
int ret;
|
||||||
|
|
||||||
/* assign early for deferred execution for non-fixed file */
|
/* assign early for deferred execution for non-fixed file */
|
||||||
if (def->needs_file && !(req->flags & REQ_F_FIXED_FILE) && !req->file)
|
if (def->needs_file && !(req->flags & REQ_F_FIXED_FILE) && !req->file)
|
||||||
@ -1636,7 +1637,9 @@ int io_req_prep_async(struct io_kiocb *req)
|
|||||||
if (io_alloc_async_data(req))
|
if (io_alloc_async_data(req))
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
}
|
}
|
||||||
return def->prep_async(req);
|
ret = def->prep_async(req);
|
||||||
|
io_kbuf_recycle(req, 0);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 io_get_sequence(struct io_kiocb *req)
|
static u32 io_get_sequence(struct io_kiocb *req)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user