From nobody Tue Nov 17 17:04: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 4jTWLb4z0yz71RH7 for ; Tue, 17 Nov 2026 17:04:55 +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 4jTWLb0S7Rz4Gf3 for ; Tue, 17 Nov 2026 17:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935095; 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=Rrn5FvXwx1boh/HVKj3Jqi0QBuh4n0Wsyw/r6NN6xdI=; b=xFsxhEpcqCV99Qob2kW5Ea0Zco9gf3crCoUcIavp2Na18xoETDVqnG+m7H8x9D3me90p7b kzHHXJVKe33alquWdMLMQTlfwS7SvUEG1C/mMRBNXdLGv4zTZ7pqp0D4UWhZgG+aO5uiL8 LJW9M0RrgXkRR3cunWpCqfFVnVwNP4y204CKFuhXyMfthEEPtFfgV3IiUT7vC2+qTCLxA8 kDPwsrhQ4HkQXnbVcro3Rlz4BBxYpyZXNAnax4zTAoGC2v6sH2EIf1e/EzO0uMnLy/ahAe S9/HfagUerDC0W2+T+h8jHDkKueTUbylSZ7b5I/5YZx4rDqXapg10pMMZhIYiw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935095; b=A4vCYSZjsU5YTidqIsBrJc6vNoOmEOkofyy9FkQuz9qk1FsXm3X1w8kSzm8LDGxcWbw30X MKgGG0+iQMoiDYlfAD1nWBypDk9uytV5jyLlzs4aa3ly5g7j/SrPCMKdIwjLPONWw33RSP r88QUnf4o6rSCFuwNpO6gmpe/LOTj7Ys5hd9tfTAYc9dLtPqQA8QA7xx9cDZk9cRBUi5w/ rHaKx4zlaQnNgKvidB4gFjLhIJp4IfR9lOFoZreYy2xVwfLeEZa7agwrRs1W6xNRHM6xcp ks1zo2wa2llmIsGXGYLFSb/FoYT7z+2JyTSxe2EHtwF2KDWRdNAUMd8fYIMTFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935095; 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=Rrn5FvXwx1boh/HVKj3Jqi0QBuh4n0Wsyw/r6NN6xdI=; b=I3S6Hs+k2abJIQVfidCWrCaz4vYmgRzGmq2+EqN0T2EGthtGx/td3WxnACXjGQgbh3BmhT 47d4UqvG0M3ZABrC3I9nh8LlH1J28PLe0NQNrq9zrbQzCJnLoTDkIz70OuJoC9cFjgblBD 8A6ZknVSy9mCrwzlWKH6wuzfx8VH3vRoZkshxf+BrxJB08cFVC9r1Pq18ISsJPUNZiyWL3 S4zCGLvkJ/gfAe8Xf+dPyc4KwUxMX9o72n5RzeQXODzLX0XwZLJwILVoummpeV/AJ52Tf6 dJ5vvRCbN+XvHonZ/sNaOgfVlRkZGIQzQPjmiVVbEm+2kSmg2/RrNhqwJPTO/g== 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 4jTWLZ1Mpfzr6s for ; Tue, 17 Nov 2026 17:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fb93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:04: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: acf5bc2b6b8b - releng/14.5 - 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.5 X-Git-Reftype: branch X-Git-Commit: acf5bc2b6b8b7a75f81466bd1d6a7ff5bef2db6f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:04:54 +0000 Message-Id: <6afc8936.1fb93.5dec25d0@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=acf5bc2b6b8b7a75f81466bd1d6a7ff5bef2db6f commit acf5bc2b6b8b7a75f81466bd1d6a7ff5bef2db6f Author: Dag-Erling Smørgrav AuthorDate: 2026-11-01 20:09:50 +0000 Commit: Mark Johnston CommitDate: 2026-11-13 22:25:31 +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 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); }