From nobody Thu Sep 28 14:07:38 2023 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 4RxFfy2lxmz4tq6p; Thu, 28 Sep 2023 14:07:38 +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 4RxFfy2DDFz3SXT; Thu, 28 Sep 2023 14:07:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695910058; 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=vu3AYRSU3fKWoVvmDLCOX6Q4j3dp9Rnyh9puom8XmPM=; b=h70gXRLSqpdQuiOD7xCweEt06ruyGmCNyO9QBTT13NsS9UbTm7ZZVVJs83cp9LTTOOjlQt wjqwJMXViWl8zFEbUSoxCA/9yEHyTvtGUyxSYZx69fu2MolGNE+yxivPFSTHsHbMImA721 h6PsBf/xAVuuUu07xCun3dSoc8jzmOW5EIlg9U4CFY6YpMREn4/a1RZOQ0SwPRdeEQBq1f 1TjVwmZE7rHVrcRSk9t60CrWMf4lBJcNW8Y2PKiFw4PCKywDHOfCz0nCxBMnWiUv/ph1Lx 1YZnmeiJ8tdutnT/Jl10x1u9JLNwAsL+j3h2XnUMkf43pvLVXyTvJRIB4eoSfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695910058; a=rsa-sha256; cv=none; b=qcJVdw1BNqdyH2gKmgc25RR5G0YESC6SILG5DGkFk0/vMvbG3rp64QYcFZgwP6UmaoAw9j IHXYozwTtOlmGeqd8pu85cy1MbCkjmi97zbG3gwHoDpLeIt9Mt7cJK2KoVu3e3Br+Ku0DT Q45yz9Kg9fY/krl5/LakRV3qbe1g57ij78aRQa1EW9U6BAKDfCovOcF21RDeJhPe1038wE 8y81oerEguuy1jrG+5f+e9fKpansH0KFPIzEiWdxiDfu4Bo3rp+N30OX8FH0wK4QmgNFAT e5klNH1+JYNgqxyT8mHWxNwFlxz5K8jnaAk069YgnvJ9WrrJCscboVjSOvidbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695910058; 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=vu3AYRSU3fKWoVvmDLCOX6Q4j3dp9Rnyh9puom8XmPM=; b=as/Uf99RUCfQXo6Y7Cu+FwMYcA9tACO8S8yXg6x1Sj6T3dg132p7SEEP3JQbf9hq7r7VNa cUGmDGI/SvzIs/W2x0VaPv1j+Pp9lNwHZSvUz2D3r1/lhrYRKiNo/v82G1y/sbY3jIJ0C/ xbSKbVJO0m/9OW/aJyXK3G7CN8oimM1uz7oNoPLyHpwspss7L1p49YwkU6g/fPLr2V0j9w 7DALpmz38xkMT9ve6yPli6Zwh6U9zu1l/idTr2Y+knlu/ZprMAu/lG7DktsEFhSjciel+h TuXCRXMOJ7iJ1pqU3udO+vmeOCsc6fISwJXKNpSPvYCb0b9dKG2fipSf2h+fFA== 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 4RxFfy0ymjz977; Thu, 28 Sep 2023 14:07:38 +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 38SE7cQh039239; Thu, 28 Sep 2023 14:07:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SE7cW9039236; Thu, 28 Sep 2023 14:07:38 GMT (envelope-from git) Date: Thu, 28 Sep 2023 14:07:38 GMT Message-Id: <202309281407.38SE7cW9039236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 15a51d3abaef - main - copy_file_range: require CAP_SEEK capability 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15a51d3abaef27ddea66320cac7caa549738a1a6 Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=15a51d3abaef27ddea66320cac7caa549738a1a6 commit 15a51d3abaef27ddea66320cac7caa549738a1a6 Author: Mariusz Zaborski AuthorDate: 2023-09-28 13:24:39 +0000 Commit: Mariusz Zaborski CommitDate: 2023-09-28 13:48:07 +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 --- 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) {