git: 71cfc19e024b - stable/13 - vfs_vnops.c: Fix cherry-pick of e7044084cf81
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Jan 2024 15:45:23 UTC
The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=71cfc19e024bd68caf6bd2a4ec2e2e4fececf12d commit 71cfc19e024bd68caf6bd2a4ec2e2e4fececf12d Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2024-01-03 15:40:15 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> 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);