From nobody Thu Nov 05 19:33:01 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 4jLCC12Nfxz6y3GP for ; Thu, 05 Nov 2026 19:33:01 +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 4jLCC10vZ3z3KKm for ; Thu, 05 Nov 2026 19:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793907181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PFlK2DI+lXMBr+LU8x/LGUp/z1BHTgoF9rs3YQbqFUA=; b=AsPXJxzXPzm5xd0zxHpDvkDpp16bNnHWF7gBosOYm2oRXFYOJqjijOo37IGVOeHLZ1cEEL mYZwGdCU19nENkP5cV5ZVIyPNfRs2Adx2FX3Y+1nEfxiDd8OZsHNIUEinPO0UUuEBQ6T0z RVUbf3VMW9tppU7WBnMgAX1QrSH4pVzwxpu5Rs/7tjeUdm5m1t3NmXtf/Hh6a+YToIG8ou 0tCIVq1BfMjj/NN8kwDzOD2n1kfaxEX59t9PhQWs9e0+MpbCC8vtR8Z16hxcSQKI3VPrvc 89yhpcYPEf+Y43+9SQPjqO0ROy8vyM740shCTRluVkINSGWSJRDhGRY91Ijitg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793907181; b=tz1ksulsT8FlDVua+893Bjjx+coULGaHaqG9Zn0bCukkr0injxx4knN6BEbtExRiA2iCpN MRoVMFSOktqaozPyiGoBOM5NDY+Ppgy6A1liQzL1fWqQMKAmMup6UM0Q/XmGu9gj089xXu V97KrhFgp7JrB9ZPvC51LutCo5crq1oUczzrTL10btiVYvAvl62nT8Pr30mnktgz98pk4e xDxuM0UIeSv6RcUfS03hGupVldqDiZS4SBpWpOfjFP/IXZfJxv/XdpVyR/hy9UeUydSoXc 68VsiSZZTZYka6+K0ZyCZCaJA5kZU4iz06YLee1pTiWaW+hMRJhXxdJFBc0agQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793907181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PFlK2DI+lXMBr+LU8x/LGUp/z1BHTgoF9rs3YQbqFUA=; b=FBLUC9J+Nh2A2q8uk4Rm1UOgiUJrCQGTEmdrRX6ZFWuTpBsB8c7spHbPlJ3H6uWkm8yIc8 ngGPLur4C2ZaCavUTxwu72BtFulxJdU0JBIujrhX0Z18rakyZo/D93iiOBDAsn2+vMAPsx GM/uySjlJmu5VLrC9dOmFHVE9NRY3fNp/dcsXzyrXUZgMUONVA70ygYOLD+nEkpi3BUoTA LU05J7un939AiOoEelyaSUslWDaROkbh/yIzFfOBMYge6VHSkSH+9jznyCNvAiWTEgppx1 POFcMkVvC8t3aSZ52y4gfyxxXsmFlqziJ7KEi/K2qIbXIErRUgtp/atbIz9zbg== 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 4jLCC10ZHFz13vr for ; Thu, 05 Nov 2026 19:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44eef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 19:33:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7c4474976b69 - stable/14 - 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 Sender: owner-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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c4474976b69551b335c808c29c3531f269864c6 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 19:33:01 +0000 Message-Id: <6aecd9ed.44eef.20f422c4@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7c4474976b69551b335c808c29c3531f269864c6 commit 7c4474976b69551b335c808c29c3531f269864c6 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-01 20:09:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 17:45:32 +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. PR: 298159 MFC after: 1 week Reviewed by: olce, kib Differential Revision: https://reviews.freebsd.org/D59412 (cherry picked from commit b487aca48535e5f04e4913447fcbe33f1bf56c68) --- 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 28add36a9cb1..e94db5375ba9 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1455,7 +1455,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; @@ -1477,7 +1477,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; @@ -1487,9 +1486,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); @@ -1553,6 +1558,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); }