io_uring: fix explicit async read/write mapping for large segments (c183edff) · Commits · 戴 / test

If we exceed UIO_FASTIOV, we don't handle the transition correctly between an allocated vec for requests that are queued with IOSQE_ASYNC. Store the iovec appropriately and re-set it in the iter iov in case it changed. Fixes: ("io_uring: retain iov_iter state over io_read/io_write calls") Reported-by:

Nick Hill <nick@nickhill.org> Tested-by:

Norman Maurer <norman.maurer@googlemail.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

fs/io_uring.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -2980,14 +2980,15 @@ static inline int io_rw_prep_async(struct io_kiocb *req, int rw,
		bool force_nonblock)
		{
		struct io_async_rw *iorw = &req->io->rw;
		struct iovec *iov;
		ssize_t ret;

		iorw->iter.iov = iorw->fast_iov;
		ret = __io_import_iovec(rw, req, (struct iovec **) &iorw->iter.iov,
		&iorw->iter, !force_nonblock);
		iorw->iter.iov = iov = iorw->fast_iov;
		ret = __io_import_iovec(rw, req, &iov, &iorw->iter, !force_nonblock);
		if (unlikely(ret < 0))
		return ret;

		iorw->iter.iov = iov;
		io_req_map_rw(req, iorw->iter.iov, iorw->fast_iov, &iorw->iter);
		return 0;
		}

Admin message