Date: Wed, 3 Mar 2021 15:41:55 GMT From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 2d379aed1e5c - releng/13.0 - copy_file_range(2): Fix for small values of input file offset and len Message-ID: <202103031541.123FftBC084820@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/13.0 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2d379aed1e5c52956c5257d286a781e9a32e68b3 commit 2d379aed1e5c52956c5257d286a781e9a32e68b3 Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2021-03-01 14:28:30 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2021-03-03 15:40:39 +0000 copy_file_range(2): Fix for small values of input file offset and len r366302 broke copy_file_range(2) for small values of input file offset and len. It was possible for rem to be greater than len and then "len - rem" was a large value, since both variables are unsigned. Approved by: re (gjb) (cherry picked from commit a5f9fe2bab789f49e8b53da3a62dbd34725e23ea) --- 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 71dd379558cb..9ea792833255 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3126,7 +3126,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, rem = *inoffp % blksize; if (rem > 0) rem = blksize - rem; - if (len - rem > blksize) + if (len > rem && len - rem > blksize) len = savlen = rounddown(len - rem, blksize) + rem; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103031541.123FftBC084820>