git: b0f6f6da391c - releng/14.4 - vfs: Avoid integer overflow when faulting
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Nov 2026 17:03:54 UTC
The branch releng/14.4 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=b0f6f6da391cebf7bbd41f22c9bce431a6c2bf1a
commit b0f6f6da391cebf7bbd41f22c9bce431a6c2bf1a
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-11-01 20:09:50 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-11-13 22:03:53 +0000
vfs: Avoid integer overflow when faulting
In vn_io_fault1(), the read / write length can easily exceed INT_MAX.
Passing it directly to uiomove(), which expects an int, results in a
negative uio_resid, which to the caller looks like we read more than
was requested.
Approved by: so
Security: FreeBSD-EN-26:30.vfs
PR: 298159
MFC after: 1 week
Reviewed by: olce, kib
Differential Revision: https://reviews.freebsd.org/D59412
(cherry picked from commit b487aca48535e5f04e4913447fcbe33f1bf56c68)
(cherry picked from commit 7c4474976b69551b335c808c29c3531f269864c6)
---
sys/kern/vfs_vnops.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index ee247de2374c..3ce2ba0542f4 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1452,7 +1452,7 @@ vn_io_fault1(struct vnode *vp, struct uio *uio, struct vn_io_fault_args *args,
vm_page_t *prev_td_ma;
vm_prot_t prot;
vm_offset_t addr, end;
- size_t len, resid;
+ size_t len;
ssize_t adv;
int error, cnt, saveheld, prev_td_ma_cnt;
@@ -1474,7 +1474,6 @@ vn_io_fault1(struct vnode *vp, struct uio *uio, struct vn_io_fault_args *args,
* point using UIO_NOCOPY below.
*/
uio_clone = cloneuio(uio);
- resid = uio->uio_resid;
short_uio.uio_segflg = UIO_USERSPACE;
short_uio.uio_rw = uio->uio_rw;
@@ -1484,9 +1483,15 @@ vn_io_fault1(struct vnode *vp, struct uio *uio, struct vn_io_fault_args *args,
if (error != EFAULT)
goto out;
+ /*
+ * Advance clone to the redo point.
+ */
atomic_add_long(&vn_io_faults_cnt, 1);
uio_clone->uio_segflg = UIO_NOCOPY;
- uiomove(NULL, resid - uio->uio_resid, uio_clone);
+ while (uio_clone->uio_resid > uio->uio_resid) {
+ len = MIN(uio_clone->uio_resid - uio->uio_resid, INT_MAX);
+ uiomove(NULL, len, uio_clone);
+ }
uio_clone->uio_segflg = uio->uio_segflg;
saveheld = curthread_pflags_set(TDP_UIOHELD);
@@ -1550,6 +1555,7 @@ vn_io_fault1(struct vnode *vp, struct uio *uio, struct vn_io_fault_args *args,
curthread_pflags_restore(saveheld);
out:
freeuio(uio_clone);
+ MPASS(uio->uio_resid >= 0);
return (error);
}