From nobody Mon Oct 02 08:15:37 2023 X-Original-To: dev-commits-src-branches@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 4RzYfx69gtz4vlYq; Mon, 2 Oct 2023 08:15:37 +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 4RzYfx5Cwsz4J7R; Mon, 2 Oct 2023 08:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696234537; 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=4k/e29lN2GBPyFdEArsnSMvjsc4Fde3uOE/Eumk/WKM=; b=Bc2wZY87IfCsrQ9Gt57xVjqur8/o5oe6FWYNVPoTuu0yUASIIUNUVj7d5MWAKVKB8cQ1rl jE5TbCdI13mj6PdU1++Acvx3muZTKm9TTYqIDH+SKULgHzi8UTT85PBChaD23U/B+A0uFG gHDBl/PGS58svyG9r59XPdeUxxN3Hr2gNFi6dI5tVYQFyvmxE9fjQxteakyYaZxK9320F0 plL0Az1YBXMx75CoOzR/wCDSJAFfakBP51wpFRFPbjfL9xODY8i6eVg5Z6mBMcH/oBIFpD aIF1EtvnrRqSm+A9H079CPsiknqL+mqrzxZ5vy45Kp43deGl8dGWvkLFa1tLmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696234537; a=rsa-sha256; cv=none; b=sGf/1pnXJHO14QltkouhlDy31v4ByqVcGl76dOaFHoqdl35tjWqqWzz8c9MwIYpFigWOuw JwDLpVGWzIZLGWZIgCCcterWlvcACmbCdUsjYxDryBUfuF4rp1Fs9yQPPPeBv5nk46+GVm 75kRuLZNP2QrbPEsnJMeNVd8KTrJ697OpSAFrQOL1HvoLiyZ59/CoY+m7yibTicC1taINA VBQt/Qvg6sBy5nSBxMYiiZOLsMFCWrCZ74K4GFqVejonP4z0miZ2HImfJ50vwUj09Cwigy U5YlQwMl+8iZM1b+vVmu1/hAqjjuxKvq3+Mo47i0NbkxmJ7CFTxrxvtVBQMN3Q== 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=1696234537; 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=4k/e29lN2GBPyFdEArsnSMvjsc4Fde3uOE/Eumk/WKM=; b=iHnYGVJVrU4/iOBvOtY4a4Cag/RSOFF+tdbIhOoOTrQ6qvOO1YLnb/P2cFIf54aJX0Gohw vYrbqbh9rriPoYkBumOHvv7DT75ZXNAfYyMmC82FySCsFAyZa0tJiXy06PNLugN5j1TB/z xMIeDrIoikBcIy2fQsH19LzhJXkdrthVsxx2KxwtRRTjNoXzPE7yu2W8FZ2mHYJs3vjt0m krX/F2CVQdoSPBStUxIxh5R05c8XBNG10X+Md5/v2SnDM5OGMrPK4UMjm6Y2I0PmbJCXNO YaLcA5w3ABB/tnLzYb4eli0kgI/meQVaSxMzuShf56pbyg53q40x/htPvybFXw== 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 4RzYfx4GWKz144t; Mon, 2 Oct 2023 08:15:37 +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 3928FbLV068988; Mon, 2 Oct 2023 08:15:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3928Fb40068985; Mon, 2 Oct 2023 08:15:37 GMT (envelope-from git) Date: Mon, 2 Oct 2023 08:15:37 GMT Message-Id: <202310020815.3928Fb40068985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 87d68b131ef6 - stable/14 - copy_file_range: require CAP_SEEK capability List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 87d68b131ef65a0a5fb897280359e46067064a53 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=87d68b131ef65a0a5fb897280359e46067064a53 commit 87d68b131ef65a0a5fb897280359e46067064a53 Author: Mariusz Zaborski AuthorDate: 2023-09-28 13:24:39 +0000 Commit: Mariusz Zaborski 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) {