summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorKeith Busch <kbusch@kernel.org>2023-11-21 01:18:31 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-12-08 10:44:26 +0300
commit40532b29138e9dee9997f82f13ed36c010927882 (patch)
tree606e20c5479dbd944ac97962c96423659423a95d /fs
parent9e7f410f6a431b6a896a6f37e108c6836752e000 (diff)
downloadlinux-40532b29138e9dee9997f82f13ed36c010927882.tar.xz
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 'fs')
-rw-r--r--fs/io_uring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 3683ddeb625a..adc263400471 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1256,7 +1256,7 @@ static int io_import_fixed(struct io_ring_ctx *ctx, int rw,
*/
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;