aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2026-07-26 21:45:07 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2026-07-27 18:46:32 +0000
commit34ca5a9e7362b0c820fe339daa2b8d06c58b6fea (patch)
treed7dbe2c9de36559f653a4d95d9a2a93129a2f6d1
parentc13a9982b56f873c7aa3374a69f6aa296a2d1968 (diff)
geom_zero(4): reset the uio vector on each uiomove()
PR: 297062 Tested by: Jordan Gordeev <jgopensource@proton.me> Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58472
-rw-r--r--sys/geom/zero/g_zero.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c
index 25d462a9f918..e02fffbd6f02 100644
--- a/sys/geom/zero/g_zero.c
+++ b/sys/geom/zero/g_zero.c
@@ -83,11 +83,6 @@ g_zero_fill_pages(struct bio *bp)
size_t length;
vm_offset_t offset;
- aiovec.iov_base = g_zero_buffer;
- aiovec.iov_len = PAGE_SIZE;
- auio.uio_iov = &aiovec;
- auio.uio_iovcnt = 1;
- auio.uio_offset = 0;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_WRITE;
auio.uio_td = curthread;
@@ -101,6 +96,12 @@ g_zero_fill_pages(struct bio *bp)
bp->bio_resid = bp->bio_length;
offset = bp->bio_ma_offset & PAGE_MASK;
for (int i = 0; i < bp->bio_ma_n && bp->bio_resid > 0; i++) {
+ aiovec.iov_base = g_zero_buffer;
+ aiovec.iov_len = PAGE_SIZE;
+ auio.uio_iov = &aiovec;
+ auio.uio_iovcnt = 1;
+ auio.uio_offset = 0;
+
length = MIN(PAGE_SIZE - offset, bp->bio_resid);
auio.uio_resid = length;