From nobody Thu Nov 05 19:32:59 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 4jLCC43Xxkz6y3VM for ; Thu, 05 Nov 2026 19:33:04 +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 4jLCC41t8Pz3K8k for ; Thu, 05 Nov 2026 19:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793907184; 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=e9lOSfdXwOj7ytzUIW/BvY2wL6vOZ+gHYSV4/+lNB1k=; b=Q/BLtiaG1bzzQ7nttFcZ1vn7yb+aqEaBLhuAqbdBlFqSz+it5Teguky5XqR5OjPO8arP43 Qr3EdsyiUCwmBZTZ5hxkUgTqoux7YIztJMns6Nym86PUxj8z9rAe4oosheoBBZlOGMEgw8 9V2QpMnTDTe9OaOHFRJJcR+SfBTmsbEJHECYCwAy+IGbqfk93I+q1b8NlYn0X9ZlYE46Hb jRmb1qpZxL64B7WwIhIFI5GcuNkse3f8DcK3bli1C+EEky+eBfRi7DFJwM++YMq/MVwutA 5ZCOJwb7Q/wwZ/UT3Tw8A8DSYwzIbenJ6FuTrTKs7bTYwI0kFAjxbZLOMnhl4A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793907184; b=u0+7Tam0W7sN32dfQJX9ZfdFBiq9XCr378Vindvily6rAgFLLAZfjZjtTk9oAPzdTfGpAD vwOx8LCmWzS9YpQpBaK74jDrUqDt5OFLBKP5NhXU6O5vIlgQqPY7j73WNKtOpZcX1vcyik oZffggVWeiF8KGdcsjY/83wqx6JUfCxKXmUHl5+xy+B+nhpGTaP6HpCMWCEvlhMEmb17Nl WTZK2tl3iUuOAbHo1x24aiL/TpMwLhOQjsOyiN9kW6ToHc6Y82aaH9odaDfYJ7QyIbhmvn W5QB5FeC57Lz/2fM3vCZ6e25xh5iP/BiZ4xgmr9B5o39yQT19Rgnf1xddQcv8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793907184; 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=e9lOSfdXwOj7ytzUIW/BvY2wL6vOZ+gHYSV4/+lNB1k=; b=qru/icxsXb/nz88zmz/OjPK7v7pgbir7GefNBgxbDeSyuIjJ9kh4DJwufk9o2NDvMpjJT5 YDeE71dfq0tDG2y5AzbjioWREwtrRnvWB5xf0XdKXW+jrfXyYl6UZ3QlxiT2LZJ1Z31vdQ dWAQeWgVXYq3SUg5gyI20vudPJKTmL1lGgQFwJeCHkmYMI+ZQvtqXpI6MwaM40XiZIMdh3 oHIRmQAUTDiTGpkcq0kY9sC8vb77adTh6C1dj3Hvk49atVc8o15dWLO/dMa8gmwDzwUeb8 NlET3Bfvr2+JOjPSKs1we3l+25tEhS2xBwp4CifDMzOkYYZI8so35FbPQzWDqA== 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 4jLCC41XRsz13CV for ; Thu, 05 Nov 2026 19:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4796d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 19:32:59 +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: 094663270363 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 09466327036385d378da09d4878fa3a6ad63361e Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 19:32:59 +0000 Message-Id: <6aecd9eb.4796d.25621d56@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=09466327036385d378da09d4878fa3a6ad63361e commit 09466327036385d378da09d4878fa3a6ad63361e Author: Dag-Erling Smørgrav AuthorDate: 2026-11-01 20:09:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 17:45:26 +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 6e2ace420441..defede5e0cab 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1535,7 +1535,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; @@ -1557,7 +1557,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; @@ -1567,9 +1566,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); @@ -1633,6 +1638,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); }