The branch stable/14 has been updated by oshogbo:
URL:
https://cgit.FreeBSD.org/src/commit/?id=87d68b131ef65a0a5fb897280359e46067064a53
commit 87d68b131ef65a0a5fb897280359e46067064a53
Author: Mariusz Zaborski <osho...@freebsd.org>
AuthorDate: 2023-09-28 13:24:39 +0000
Commit: Mariusz Zaborski <osho...@freebsd.org>
CommitDate: 2023-10-02 08:16:24 +0000
copy_file_range: require CAP_SEEK capability
When using copy_file_range(2) with an offset parameter,
the CAP_SEEK capability should be required.
This requirement is similar to the behavior observed with
pread(2)/pwrite(2).
Reported by: theraven
Reviewed by: emaste, theraven, kib, markj
Approved by: secteam
Differential Revision: https://reviews.freebsd.org/D41967
(cherry picked from commit 15a51d3abaef27ddea66320cac7caa549738a1a6)
---
sys/kern/vfs_syscalls.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 06b861a2eb73..9d85a295a6ef 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -4899,7 +4899,8 @@ kern_copy_file_range(struct thread *td, int infd, off_t
*inoffp, int outfd,
len = SSIZE_MAX;
/* Get the file structures for the file descriptors. */
- error = fget_read(td, infd, &cap_read_rights, &infp);
+ error = fget_read(td, infd,
+ inoffp != NULL ? &cap_pread_rights : &cap_read_rights, &infp);
if (error != 0)
goto out;
if (infp->f_ops == &badfileops) {
@@ -4910,7 +4911,8 @@ kern_copy_file_range(struct thread *td, int infd, off_t
*inoffp, int outfd,
error = EINVAL;
goto out;
}
- error = fget_write(td, outfd, &cap_write_rights, &outfp);
+ error = fget_write(td, outfd,
+ outoffp != NULL ? &cap_pwrite_rights : &cap_write_rights, &outfp);
if (error != 0)
goto out;
if (outfp->f_ops == &badfileops) {
