From nobody Tue Nov 17 17:07:29 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 4jTWPZ2V2Wz71S8r for ; Tue, 17 Nov 2026 17:07:30 +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 4jTWPY3kPKz4LmV for ; Tue, 17 Nov 2026 17:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935249; 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=qOBc3/wX7thbolswy8xO5EEwMXBXiKmM89tEg7dSBIU=; b=rL0SNL+8sJD41rLvKggsy0wkUJifsAFiRwXSOoxyKx8XboUsuM0XKmqCzKWEVnV5+T50lj FvbAHc4EiD+Ux5QWW09iInt/vW3KscbNr2KtDm/FNVOsw5VVIPLGDYqW/Bofpp7ET935af UXdaSSEHHbmY14v10M/gbms5b/eRYODcevtimf95l/Hd4yKyUKywUtlPj1ShMuf7QI2kWc ncIPvdGPJCzYBOf9jPZl58eQjiMIFGZR9x7NB279sSiBOLKM9SYS17YOnBlKDCYJaxF3dx WKLc4cth/K9fG27NiZ6UgyDu1kkbMWrhyBgvisUPPArh7vHfprEWiWLoGUHzdw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935249; b=kzvOs2fEu/EoUYRLJGWwsXKKgsDXr9DaEJj41SUvlRozeedvlidZpqB0gTauUfo4nAebzS GaJMEFYo3dTQUFMNxeahGbq55qf7cZ9jmWBKQi1jCwlUmC6OGLfrfiwKjwOCawo0X574LP s24yQn1jiB+4Bj7Vp+KEQjJ1Pu9v2NFuFfthkukO4bcRgT8hJ5lkiOaqhgN7RochPGTxJt Kc2sNSf3Fc3nMiySJB1NqYtUy9vxVh6DhiJy9wOHf8FV4qq0+c9QCK7bGP3z1pjPs4U6IT 07taZbeU1xrA5xs2LuHqULbo9Jecg99GOrxMGSvWH8Hh6xPYQKDe7KwzGVy93A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935249; 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=qOBc3/wX7thbolswy8xO5EEwMXBXiKmM89tEg7dSBIU=; b=v0nEN5GaOlWx6GuI7jQJu4SolP7CNj2+O7VIFv1vICX1IW3qubdyCr+mrTrWp4e1ipDFEF 5QYBY+CyBg1vDiIA1qPsqtoMaykhN/tQl+mzQdKVpbgPrQ4kTVj9d48ODq6ru1B19H5q2x Dj6AbDtTksqxKP4Bamd6E24uqsSWiZ4Ov6hLxW/uVqywT2BAkHJaipifmo88jlx+eLj1lW ysAvhhe0gjlWPS2sOosGbDOsfXKtuaRl4rQTja8KRdvxocQdmG/JzwUb5BVMYHimJACFyr QRCO4AtcGZj8uR6xCTZUfvbinQ7vIMuX4XO+vPRYkBgYQqLmpFQE2YBgCJyUeA== 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 4jTWPY3MtBzrk1 for ; Tue, 17 Nov 2026 17:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fc48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:07:29 +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: c86b8f818fb9 - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: c86b8f818fb9d39596d4f58ec83be8c9a0200bc0 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:07:29 +0000 Message-Id: <6afc89d1.1fc48.59578955@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c86b8f818fb9d39596d4f58ec83be8c9a0200bc0 commit c86b8f818fb9d39596d4f58ec83be8c9a0200bc0 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-01 20:09:50 +0000 Commit: Mark Johnston CommitDate: 2026-11-14 22:53:23 +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 09466327036385d378da09d4878fa3a6ad63361e) --- 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 393353d8c038..d159b90ad260 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1491,7 +1491,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; @@ -1513,7 +1513,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; @@ -1523,9 +1522,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); @@ -1589,6 +1594,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); }