* [PATCH] io_uring: don't map read/write iovec potentially twice
@ 2020-01-31 19:11 Jens Axboe
0 siblings, 0 replies; only message in thread
From: Jens Axboe @ 2020-01-31 19:11 UTC (permalink / raw)
To: io-uring
If we have a read/write that is deferred, we already setup the async IO
context for that request. and mapped it. When we later try and execute
the request and we get -EAGAIN, we don't want to attempt to re-map it.
If we do, we end up with garbage in the iovec, which typically leads
to an -EFAULT or -EINVAL completion.
Cc: [email protected] # 5.5
Signed-off-by: Jens Axboe <[email protected]>
---
diff --git a/fs/io_uring.c b/fs/io_uring.c
index e3d75f12cf08..05b9fb0764e1 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2169,10 +2169,12 @@ static int io_setup_async_rw(struct io_kiocb *req, ssize_t io_size,
{
if (!io_op_defs[req->opcode].async_ctx)
return 0;
- if (!req->io && io_alloc_async_ctx(req))
- return -ENOMEM;
+ if (!req->io) {
+ if (io_alloc_async_ctx(req))
+ return -ENOMEM;
- io_req_map_rw(req, io_size, iovec, fast_iov, iter);
+ io_req_map_rw(req, io_size, iovec, fast_iov, iter);
+ }
req->work.func = io_rw_async;
return 0;
}
--
Jens Axboe
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-31 19:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-31 19:11 [PATCH] io_uring: don't map read/write iovec potentially twice Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox