d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a vnode locking bug in fuse_vnop_advlock.

Browse Source 
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
This commit is contained in:
Alan Somers 2020-12-30 16:50:35 -07:00
parent 34535dace9
commit 542711e520
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/fs/fuse/fuse_vnops.c
View File

@ -432,18 +432,6 @@ fuse_vnop_advlock(struct vop_advlock_args *ap)
return ENXIO; 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) { switch(ap->a_op) {
case F_GETLK: case F_GETLK:
op = FUSE_GETLK; op = FUSE_GETLK;
@ -458,6 +446,20 @@ fuse_vnop_advlock(struct vop_advlock_args *ap)
return EINVAL; 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); fdisp_make_vp(&fdi, op, vp, td, cred);
fli = fdi.indata; fli = fdi.indata;
fli->fh = fufh->fh_id; fli->fh = fufh->fh_id;
@ -487,6 +489,8 @@ fuse_vnop_advlock(struct vop_advlock_args *ap)
} }
} }
out:
VOP_UNLOCK(vp);
return err; return err;
} }