io_uring: import_single_range() returns 0/-ERROR

axboe · axboe · commit 3a9015988b3d · 2020-02-26T07:06:57.000-07:00
Unlike the other core import helpers, import_single_range() returns 0 on success, not the length imported. This means that links that depend on the result of non-vec based IORING_OP_{READ,WRITE} that were added for 5.5 get errored when they should not be. Fixes: 3a6820f ("io_uring: add non-vectored read/write commands") Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/fs/io_uring.c b/fs/io_uring.c
@@ -2075,7 +2075,7 @@ static ssize_t io_import_iovec(int rw, struct io_kiocb *req,
 		ssize_t ret;
 		ret = import_single_range(rw, buf, sqe_len, *iovec, iter);
 		*iovec = NULL;
-		return ret;
+		return ret < 0 ? ret : sqe_len;
 	}
 
 	if (req->io) {

Original file line number	Diff line number	Diff line change
`@@ -2075,7 +2075,7 @@ static ssize_t io_import_iovec(int rw, struct io_kiocb *req,`
`2075`	`2075`	`ssize_t ret;`
`2076`	`2076`	`ret = import_single_range(rw, buf, sqe_len, *iovec, iter);`
`2077`	`2077`	`*iovec = NULL;`
`2078`		`- return ret;`
	`2078`	`+ return ret < 0 ? ret : sqe_len;`
`2079`	`2079`	`}`
`2080`	`2080`
`2081`	`2081`	`if (req->io) {`