diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2002-02-12 18:41:22 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2002-02-12 18:41:22 +0000 |
| commit | bce72aba44fc06f9485a2c002aebaa7fd92f58c9 (patch) | |
| tree | a901de254a1adbbb79ca2af589bd871ea67cf9d7 /sys/compat/common/vfs_syscalls_43.c | |
| parent | 10bd0832e038949eb0133f149a0bbe6f9501c17a (diff) | |
More FREF/FRELE protection. This time all users of getvnode.
Diffstat (limited to 'sys/compat/common/vfs_syscalls_43.c')
| -rw-r--r-- | sys/compat/common/vfs_syscalls_43.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/compat/common/vfs_syscalls_43.c b/sys/compat/common/vfs_syscalls_43.c index 976043be90c..e9ccc4c1e83 100644 --- a/sys/compat/common/vfs_syscalls_43.c +++ b/sys/compat/common/vfs_syscalls_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls_43.c,v 1.16 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: vfs_syscalls_43.c,v 1.17 2002/02/12 18:41:20 art Exp $ */ /* $NetBSD: vfs_syscalls_43.c,v 1.4 1996/03/14 19:31:52 christos Exp $ */ /* @@ -355,10 +355,13 @@ compat_43_sys_getdirentries(p, v, retval) return (error); if ((fp->f_flag & FREAD) == 0) return (EBADF); + FREF(fp); vp = (struct vnode *)fp->f_data; unionread: - if (vp->v_type != VDIR) - return (EINVAL); + if (vp->v_type != VDIR) { + error = EINVAL; + goto bad; + } aiov.iov_base = SCARG(uap, buf); aiov.iov_len = SCARG(uap, count); auio.uio_iov = &aiov; @@ -428,13 +431,13 @@ unionread: } VOP_UNLOCK(vp, 0, p); if (error) - return (error); + goto bad; if ((SCARG(uap, count) == auio.uio_resid) && union_check_p && (union_check_p(p, &vp, fp, auio, &error) != 0)) goto unionread; if (error) - return (error); + goto bad; if ((SCARG(uap, count) == auio.uio_resid) && (vp->v_flag & VROOT) && @@ -450,5 +453,7 @@ unionread: error = copyout((caddr_t)&loff, (caddr_t)SCARG(uap, basep), sizeof(long)); *retval = SCARG(uap, count) - auio.uio_resid; +bad: + FRELE(fp); return (error); } |