diff options
| author | Keith Busch <kbusch@kernel.org> | 2023-11-20 14:18:31 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-08 08:46:11 +0100 |
| commit | 8fb79be6e9800abd6e07d6f7254ebb0317300dd7 (patch) | |
| tree | 034fd1cb1035f66964e59188e1bfd3b1246f31a0 /io_uring | |
| parent | f5f85ea5bb6affeb97c36844fbaa5776cc9227ff (diff) | |
| download | linux-8fb79be6e9800abd6e07d6f7254ebb0317300dd7.tar.gz linux-8fb79be6e9800abd6e07d6f7254ebb0317300dd7.tar.bz2 linux-8fb79be6e9800abd6e07d6f7254ebb0317300dd7.zip | |
io_uring: fix off-by one bvec index
commit d6fef34ee4d102be448146f24caf96d7b4a05401 upstream.
If the offset equals the bv_len of the first registered bvec, then the
request does not include any of that first bvec. Skip it so that drivers
don't have to deal with a zero length bvec, which was observed to break
NVMe's PRP list creation.
Cc: stable@vger.kernel.org
Fixes: bd11b3a391e3 ("io_uring: don't use iov_iter_advance() for fixed buffers")
Signed-off-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20231120221831.2646460-1-kbusch@meta.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 1fe05e70cc79..0c4f159865b9 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -3149,7 +3149,7 @@ static int __io_import_fixed(struct io_kiocb *req, int rw, struct iov_iter *iter */ const struct bio_vec *bvec = imu->bvec; - if (offset <= bvec->bv_len) { + if (offset < bvec->bv_len) { iov_iter_advance(iter, offset); } else { unsigned long seg_skip; |