From owner-dev-commits-src-main@freebsd.org Sun Jan 3 16:17:15 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 38C994D6082; Sun, 3 Jan 2021 16:17:15 +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 4D83n712gJz3Lvf; Sun, 3 Jan 2021 16:17:15 +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 167EE2915; Sun, 3 Jan 2021 16:17:15 +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 103GHEQQ052639; Sun, 3 Jan 2021 16:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 103GHEcc052638; Sun, 3 Jan 2021 16:17:14 GMT (envelope-from git) Date: Sun, 3 Jan 2021 16:17:14 GMT Message-Id: <202101031617.103GHEcc052638@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: 542711e52079 - main - Fix a vnode locking bug in fuse_vnop_advlock. 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: 542711e52079f65647ac1daadf0c9e74cb221f3e 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 16:17:15 -0000 The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=542711e52079f65647ac1daadf0c9e74cb221f3e commit 542711e52079f65647ac1daadf0c9e74cb221f3e Author: Alan Somers AuthorDate: 2020-12-30 23:50:35 +0000 Commit: Alan Somers CommitDate: 2021-01-03 16:16:23 +0000 Fix a vnode locking bug in fuse_vnop_advlock. Must lock the vnode before accessing the fufh table. Also, check for invalid parameters earlier. Bug introduced by r346170. MFC after: 2 weeks Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D27936 --- sys/fs/fuse/fuse_vnops.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 1e9434f9403d..437236882457 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -432,18 +432,6 @@ fuse_vnop_advlock(struct vop_advlock_args *ap) return ENXIO; } - if (!(dataflags & FSESS_POSIX_LOCKS)) - return vop_stdadvlock(ap); - /* FUSE doesn't properly support flock until protocol 7.17 */ - if (flags & F_FLOCK) - return vop_stdadvlock(ap); - - err = fuse_filehandle_get_anyflags(vp, &fufh, cred, pid); - if (err) - return err; - - fdisp_init(&fdi, sizeof(*fli)); - switch(ap->a_op) { case F_GETLK: op = FUSE_GETLK; @@ -458,6 +446,20 @@ fuse_vnop_advlock(struct vop_advlock_args *ap) return EINVAL; } + if (!(dataflags & FSESS_POSIX_LOCKS)) + return vop_stdadvlock(ap); + /* FUSE doesn't properly support flock until protocol 7.17 */ + if (flags & F_FLOCK) + return vop_stdadvlock(ap); + + vn_lock(vp, LK_SHARED | LK_RETRY); + + err = fuse_filehandle_get_anyflags(vp, &fufh, cred, pid); + if (err) + goto out; + + fdisp_init(&fdi, sizeof(*fli)); + fdisp_make_vp(&fdi, op, vp, td, cred); fli = fdi.indata; fli->fh = fufh->fh_id; @@ -487,6 +489,8 @@ fuse_vnop_advlock(struct vop_advlock_args *ap) } } +out: + VOP_UNLOCK(vp); return err; }