avoid lock leak in error branch of sys_fchdir()

thanks to Tom Spindler and Greg Oster in helping find the cure
This commit is contained in:
pooka 2007-02-28 20:39:06 +00:00
parent 57fb2c65f9
commit 428270cc03
1 changed files with 7 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_syscalls.c,v 1.302 2007/02/18 20:36:36 pooka Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.303 2007/02/28 20:39:06 pooka Exp $ */
/*
* Copyright (c) 1989, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.302 2007/02/18 20:36:36 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.303 2007/02/28 20:39:06 pooka Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_43.h"
@ -995,6 +995,10 @@ sys_fchdir(struct lwp *l, void *v, register_t *retval)
error = ENOTDIR;
else
error = VOP_ACCESS(vp, VEXEC, l->l_cred, l);
if (error) {
vput(vp);
goto out;
}
while (!error && (mp = vp->v_mountedhere) != NULL) {
if (vfs_busy(mp, 0, 0))
continue;
@ -1003,11 +1007,8 @@ sys_fchdir(struct lwp *l, void *v, register_t *retval)
error = VFS_ROOT(mp, &tdp);
vfs_unbusy(mp);
if (error)
break;
vp = tdp;
}
if (error) {
goto out;
vp = tdp;
}
VOP_UNLOCK(vp, 0);