Module Name: src
Committed By: hannken
Date: Sat Mar 19 20:05:21 UTC 2011
Modified Files:
src/sys/fs/msdosfs: msdosfs_vnops.c
src/tests/fs/vfs: t_vnops.c
Log Message:
Remove a vnode reference leak from msdosfs_rename. Release tdvp if either
doscheckpath() or relookup() fails.
Adjust test fs/vfs/t_vnops.c and remove the link count test for msdos.
Fixes PR #44661
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/fs/msdosfs/msdosfs_vnops.c
cvs rdiff -u -r1.21 -r1.22 src/tests/fs/vfs/t_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_vnops.c
diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.72 src/sys/fs/msdosfs/msdosfs_vnops.c:1.73
--- src/sys/fs/msdosfs/msdosfs_vnops.c:1.72 Thu Mar 3 08:10:45 2011
+++ src/sys/fs/msdosfs/msdosfs_vnops.c Sat Mar 19 20:05:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.72 2011/03/03 08:10:45 pooka Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.73 2011/03/19 20:05:21 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.72 2011/03/03 08:10:45 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.73 2011/03/19 20:05:21 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -935,11 +935,11 @@
*/
vref(tdvp);
if ((error = doscheckpath(ip, dp)) != 0)
- goto out;
+ goto bad;
vn_lock(tdvp, LK_EXCLUSIVE | LK_RETRY);
if ((error = relookup(tdvp, &tvp, tcnp, 0)) != 0) {
VOP_UNLOCK(tdvp);
- goto out;
+ goto bad;
}
dp = VTODE(tdvp);
xp = tvp ? VTODE(tvp) : NULL;
@@ -1114,7 +1114,6 @@
if (tvp)
vput(tvp);
vrele(tdvp);
-out:
ip->de_flag &= ~DE_RENAME;
vrele(fdvp);
vrele(fvp);
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.21 src/tests/fs/vfs/t_vnops.c:1.22
--- src/tests/fs/vfs/t_vnops.c:1.21 Thu Mar 3 10:57:30 2011
+++ src/tests/fs/vfs/t_vnops.c Sat Mar 19 20:05:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.21 2011/03/03 10:57:30 pooka Exp $ */
+/* $NetBSD: t_vnops.c,v 1.22 2011/03/19 20:05:21 hannken Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -290,14 +290,12 @@
RL(rump_sys_rename(pb2, pb3));
RL(rump_sys_stat(pb1, &sb));
- ATF_CHECK_EQ(sb.st_nlink, 3);
+ if (! FSTYPE_MSDOS(tc))
+ ATF_CHECK_EQ(sb.st_nlink, 3);
RL(rump_sys_rmdir(pb3));
if (FSTYPE_TMPFS(tc))
atf_tc_expect_signal(-1, "PR kern/44288");
RL(rump_sys_rmdir(pb1));
-
- if (FSTYPE_MSDOS(tc))
- atf_tc_expect_fail("PR kern/44661");
}
static void
