From owner-dev-commits-src-main@freebsd.org Sun Jan 3 18:19:50 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 142274D9B0C; Sun, 3 Jan 2021 18:19:50 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D86VZ08rqz3mY1; Sun, 3 Jan 2021 18:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EC9304153; Sun, 3 Jan 2021 18:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 103IJnag009542; Sun, 3 Jan 2021 18:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 103IJnpu009541; Sun, 3 Jan 2021 18:19:49 GMT (envelope-from git) Date: Sun, 3 Jan 2021 18:19:49 GMT Message-Id: <202101031819.103IJnpu009541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 17a82e6af8e2 - main - Fix vnode locking bug in fuse_vnop_copy_file_range MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17a82e6af8e2bde543c9c2fbe3ce296d5b24ddc9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 18:19:50 -0000 The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=17a82e6af8e2bde543c9c2fbe3ce296d5b24ddc9 commit 17a82e6af8e2bde543c9c2fbe3ce296d5b24ddc9 Author: Alan Somers AuthorDate: 2021-01-01 20:49:30 +0000 Commit: Alan Somers CommitDate: 2021-01-03 18:16:20 +0000 Fix vnode locking bug in fuse_vnop_copy_file_range MFC-With: 92bbfe1f0d1f1c4436d1f064a16e5aaf682526ba Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D27938 --- sys/fs/fuse/fuse_vnops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index f26f96b8be99..5bbde1e278c9 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -664,14 +664,6 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) td = ap->a_fsizetd; pid = td->td_proc->p_pid; - err = fuse_filehandle_getrw(invp, FREAD, &infufh, incred, pid); - if (err) - return (err); - - err = fuse_filehandle_getrw(outvp, FWRITE, &outfufh, outcred, pid); - if (err) - return (err); - /* Lock both vnodes, avoiding risk of deadlock. */ do { err = vn_lock(outvp, LK_EXCLUSIVE); @@ -690,6 +682,14 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) if (err != 0) return (err); + err = fuse_filehandle_getrw(invp, FREAD, &infufh, incred, pid); + if (err) + goto unlock; + + err = fuse_filehandle_getrw(outvp, FWRITE, &outfufh, outcred, pid); + if (err) + goto unlock; + if (ap->a_fsizetd) { io.uio_offset = *ap->a_outoffp; io.uio_resid = *ap->a_lenp;