Merge tag 'io_uring-6.19-20251218' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux

d245b2e5 · Linus Torvalds <[email protected]> · 2025-12-20 09:38:56 -08:00

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

Commit: d245b2e53e816716637be508c90190ef471457c7
Parents: dd9b004b · 114ea9bb

Merge commit. Changes below are compared with the first parent: dd9b004b.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
io_uring/rsrc.c	modified	+1	−0	View file

io_uring/rsrc.c

View file

diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index a63474b..41c89f5 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++;