diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-20 09:38:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-20 09:38:56 -0800 |
| commit | d245b2e53e816716637be508c90190ef471457c7 (patch) | |
| tree | 60253510b9ac75971a470272415b657b49d97eb3 /io_uring/rsrc.c | |
| parent | dd9b004b7ff3289fb7bae35130c0a5c0537266af (diff) | |
| parent | 114ea9bbaf7681c4d363e13b7916e6fef6a4963a (diff) | |
Merge tag 'io_uring-6.19-20251218' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux
Pull io_uring fix from Jens Axboe:
"Just a single fix this week, for an issue with the calculation of the
number of segments in the ublk kbuf import path"
* tag 'io_uring-6.19-20251218' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
io_uring: fix nr_segs calculation in io_import_kbuf
Diffstat (limited to 'io_uring/rsrc.c')
| -rw-r--r-- | io_uring/rsrc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index a63474b331bf..41c89f5c616d 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -1059,6 +1059,7 @@ static int io_import_kbuf(int ddir, struct iov_iter *iter, if (count < imu->len) { const struct bio_vec *bvec = iter->bvec; + len += iter->iov_offset; while (len > bvec->bv_len) { len -= bvec->bv_len; bvec++; |