git: 0aa72376d73b - stable/15 - geom_zero(4): reset the uio vector on each uiomove()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 03 Aug 2026 00:25:38 UTC
The branch stable/15 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=0aa72376d73bef2612f308a6de8b33e9584894de
commit 0aa72376d73bef2612f308a6de8b33e9584894de
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-07-26 21:45:07 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-08-03 00:23:17 +0000
geom_zero(4): reset the uio vector on each uiomove()
PR: 297062
(cherry picked from commit 34ca5a9e7362b0c820fe339daa2b8d06c58b6fea)
---
sys/geom/zero/g_zero.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c
index 325e12633a31..8244df77b257 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;