From nobody Tue Nov 17 17:03:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jTWKQ2h7lz71Qq8 for ; Tue, 17 Nov 2026 17:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWKQ0t4vz4DlY for ; Tue, 17 Nov 2026 17:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/uDLFfF4T0u2iVqsal4dNlscS1vKc4pSxTlZdfK4wVo=; b=TlPLqRUzH8sz9SdfCXEDkO0jxx75um4SoU7TNqhAepPk1noTUvw8/x8y+OGuXQ+JizZnd2 ADE7ur8weCOh9fn+v5yv8EWebRfnSaJQWuNBFRjVW3j6xOBFwsum5jZgksnxPK/3dOQX52 hTYuUgo40WUv2uFUTBeti+wTiGCytHKpqYDTCz/oLR5yG2EUlq9M1+8agEMX8eS4uatvH7 1qBn6/jBejWb+O6NYPTayp5SOKOlyR08/Sh1MwxOa4ZEeA3tjQIK0+IrThx3pFW3sMJNe/ fmeHSzPYowWoyqPhqlAYLIF9gxk5mf6gvOMxqr3l/euNCP28T70wgMAqhhb5qw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935034; b=V+D9ofs66SMsTSiVpSm86U1R2GTT0Py9+Ga3RtIuZei494hWVGspGqPNFj8NBR6/8f6lgm ra85+5TTUnh9Kw9LzqI6W726BJXlnzciZDcL/f7TwI8v/nUc2vR9gq2kTz206Ld3lU0bLF B12jUnVgI4DkadM45aj/3w83PuwjQpEcwgGFk7MKX+GYrCS4Q6sPPx+s7meI+fr3Rs15P4 hUs6rnRuVrx8URBsiFQo+LIHR8OLB6o91H8QCsolFK18WLAp/CSGBOamLedhP9TWdn31iC 1kjYbDSnBYa4ea0/t5Qk29w/KeLPy7/DYXcGiCV1ouw/MwiRg7Tzz73wnFmj1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/uDLFfF4T0u2iVqsal4dNlscS1vKc4pSxTlZdfK4wVo=; b=ATC6utFoWeEGqn15V+D+C8otxDawxKx7NlhY6P7rdzuaEsQh6bVYGAk8wIjB5JBK/Z3BHZ GW3WrEa4tx59S6jOe8HqQj8m9gwNROaB8w4V5ZDNOwLu+zZQhIQ90d8dUmygqTKDZN/i57 ecctqxUA+uiSAGD8Y9WkLu2mYBY7l5oCJ2Fn1YSECC16ZmAHzUc8FnpJOLOK4e8xAlHYhc 8MW8u02QmY1PrdUQM7MnSpOXHV16pMKIPEtnZKl46SDRrucgwDR5YQgELpupDPFtrVuo/0 fgQCfWv88LlgxwVFP/O00EvWbmigmP7sCW6RuyByOwVu5eRYTT38Z6eUrNZw4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWKQ0Qz3zrfV for ; Tue, 17 Nov 2026 17:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f826 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:03:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Mark Johnston Subject: git: b0f6f6da391c - releng/14.4 - vfs: Avoid integer overflow when faulting List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: b0f6f6da391cebf7bbd41f22c9bce431a6c2bf1a Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:03:54 +0000 Message-Id: <6afc88fa.1f826.6bc2729a@gitrepo.freebsd.org> 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 AuthorDate: 2026-11-01 20:09:50 +0000 Commit: Mark Johnston 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); }