diff options
| author |   visa <visa@openbsd.org> | 2018-07-07 15:41:25 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2018-07-07 15:41:25 +0000 |
| commit | 86662e3cb094d8b202f63e6df78e6ed8170fe68c (patch) | |
| tree | 5dfd735a491b8bccc51fe636d5c5edfe53b60017 /sys/kern/spec_vnops.c | |
| parent | Fix a locking error in spec_setattr(). Unlike many VOP operations, (diff) | |
| download | wireguard-openbsd-86662e3cb094d8b202f63e6df78e6ed8170fe68c.tar.xz wireguard-openbsd-86662e3cb094d8b202f63e6df78e6ed8170fe68c.zip | |
Remember to lock v_specparent for VOP operations.
OK anton@, mpi@
Diffstat (limited to 'sys/kern/spec_vnops.c')
| -rw-r--r-- | sys/kern/spec_vnops.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c index 7ab06b71476..1c455186a3d 100644 --- a/sys/kern/spec_vnops.c +++ b/sys/kern/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.94 2018/07/07 15:40:02 visa Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.95 2018/07/07 15:41:25 visa Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -561,11 +561,16 @@ spec_getattr(void *v) { struct vop_getattr_args *ap = v; struct vnode *vp = ap->a_vp; + int error; if (!(vp->v_flag & VCLONE)) return (EBADF); - return (VOP_GETATTR(vp->v_specparent, ap->a_vap, ap->a_cred, ap->a_p)); + vn_lock(vp->v_specparent, LK_EXCLUSIVE|LK_RETRY); + error = VOP_GETATTR(vp->v_specparent, ap->a_vap, ap->a_cred, ap->a_p); + VOP_UNLOCK(vp->v_specparent); + + return (error); } int @@ -591,11 +596,16 @@ spec_access(void *v) { struct vop_access_args *ap = v; struct vnode *vp = ap->a_vp; + int error; if (!(vp->v_flag & VCLONE)) return (EBADF); - return (VOP_ACCESS(vp->v_specparent, ap->a_mode, ap->a_cred, ap->a_p)); + vn_lock(vp->v_specparent, LK_EXCLUSIVE|LK_RETRY); + error = VOP_ACCESS(vp->v_specparent, ap->a_mode, ap->a_cred, ap->a_p); + VOP_UNLOCK(vp->v_specparent); + + return (error); } /* |