Module Name: src
Committed By: maxv
Date: Fri Apr 18 05:22:13 UTC 2014
Modified Files:
src/sys/kern: vfs_syscalls.c
Log Message:
Memory leak (only triggerable from root).
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.480 -r1.481 src/sys/kern/vfs_syscalls.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/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.480 src/sys/kern/vfs_syscalls.c:1.481
--- src/sys/kern/vfs_syscalls.c:1.480 Wed Apr 16 19:25:28 2014
+++ src/sys/kern/vfs_syscalls.c Fri Apr 18 05:22:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.480 2014/04/16 19:25:28 maxv Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.481 2014/04/18 05:22:13 maxv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.480 2014/04/16 19:25:28 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.481 2014/04/18 05:22:13 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -1981,6 +1981,7 @@ dofhopen(struct lwp *l, const void *ufhp
goto bad;
}
error = vfs_fhtovp(fh, &vp);
+ vfs_copyinfh_free(fh);
if (error != 0) {
goto bad;
}
@@ -2018,14 +2019,12 @@ dofhopen(struct lwp *l, const void *ufhp
VOP_UNLOCK(vp);
*retval = indx;
fd_affix(p, fp, indx);
- vfs_copyinfh_free(fh);
return (0);
bad:
fd_abort(p, fp, indx);
if (vp != NULL)
vput(vp);
- vfs_copyinfh_free(fh);
return (error);
}
