From nobody Wed Jan 03 15:45:23 2024 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 4T4vDz5G7Kz567n6; Wed, 3 Jan 2024 15:45:23 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4vDz4nPxz4bMh; Wed, 3 Jan 2024 15:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704296723; 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=RFrPrqBlGdwX1xm5/sqGc+BiV6iLGTLihTzpUzIW9XY=; b=KpRbriUcTcIkmfvcB6Pii9r37B8U3gBCrp0J8WTJ6RMleT3X+2MqAFH5RhdNS5aCTo7TuK Ff1SP52dccnX5+a1TH3V2LnfDZ/b52W9l529g8dp9k5DzjpXYnJcQi5kbX7XbnyNycycsx l0iiywlqNa6QSlFO65OEvkj1H/4NV+wG4Ppdnh8PAZY2P8tdLNqFdR5ruYTwtQfudQy39C t2CPWbpvV94Sxeu1H1MWNthYTZw7sy9vVkRtCeDAuYVXMDRHE/rEJI30S8zMsvUVxhq+ZF udcxbqXZ4sppFSe/zW5N7L48ZoMjwbianJ//j1RQ6YSPCUf5T7WopHDWY3Yjxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704296723; 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=RFrPrqBlGdwX1xm5/sqGc+BiV6iLGTLihTzpUzIW9XY=; b=Gsn4NRDuOxXlDC1dpPGjcX2pWHVYifMPCVo4A8YJCSm1Ib+hH37YRjHk5mWevrdQIVHIJO wMNQ2FyJnz6+YA9yW62mN+HyIK552x0xx6zeryEeVZ9RmsK3gt2SwHR12lDOF1SeiyoUZ2 KaAAxZ1sqf77kfIncbU2gpnhg6AsoU2NoHfarTL50CXP/5sBgBplqogYi2Mg392tP52yev FGfojwImEE2tMMFs0gzw6706ocdexBv37XIGrVeiUR1mkruIjHZOhNV0Vpw+OGSba+rEiv KxPQJz5itqNbahT5scz9XDrlY241FLGV/QqUrg5naoO/WT8cOty9q9hZ0keI2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704296723; a=rsa-sha256; cv=none; b=NVit/+i1Gac+Ym1m7pLEUbXnye373BuyyRyg16qvhJVeEhrjy+OCILuauTzwIAQ98V4F8n AAPqOOqDfwO5gnuiTlcxuePhhcCl36pdd6Pv6QucUXXxV2uJMnZZGjFpr4xg6vK5tr6fgG ZaLbPH+QmWRRwhd1xZ03iEAzgg+WQrd4suVbUwAVpCrE8Xib9QynxIGCASl1YJk2FiWnra xmftbdea+P0JH6Q7DXSBHL0mFrG6FeTG/xEr20FZ2FjB3HP1ZKT9FecmtRTH1w5/uVKBvn aC45Twqjqzk8UlsoeSLvi44hmlN3l7pctoY6597RlX6S7MuZJhorQ3S06wWTRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T4vDz3qktzqk6; Wed, 3 Jan 2024 15:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403FjNXZ031500; Wed, 3 Jan 2024 15:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403FjNYW031496; Wed, 3 Jan 2024 15:45:23 GMT (envelope-from git) Date: Wed, 3 Jan 2024 15:45:23 GMT Message-Id: <202401031545.403FjNYW031496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 71cfc19e024b - stable/13 - vfs_vnops.c: Fix cherry-pick of e7044084cf81 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 71cfc19e024bd68caf6bd2a4ec2e2e4fececf12d Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=71cfc19e024bd68caf6bd2a4ec2e2e4fececf12d commit 71cfc19e024bd68caf6bd2a4ec2e2e4fececf12d Author: Rick Macklem AuthorDate: 2024-01-03 15:40:15 +0000 Commit: Rick Macklem CommitDate: 2024-01-03 15:40:15 +0000 vfs_vnops.c: Fix cherry-pick of e7044084cf81 Oops, my bad. When I did the cherry-pick of e7044084cf81 I missed changing outsize to va.va_size. This direct commit fixes it. PR: 276045 --- sys/kern/vfs_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index f5961a33f960..be3739f41086 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3358,7 +3358,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, *outoffp <= OFF_MAX - len && va.va_size <= *outoffp + len && *inoffp < inva.va_size && *outoffp <= OFF_MAX - (inva.va_size - *inoffp) && - outsize <= *outoffp + (inva.va_size - *inoffp)) { + va.va_size <= *outoffp + (inva.va_size - *inoffp)) { #ifdef MAC error = mac_vnode_check_write(curthread->td_ucred, outcred, outvp);