Module Name: src
Committed By: justin
Date: Sun Aug 17 19:28:46 UTC 2014
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
Fix memory leak on error case, as reported in
http://m00nbsd.net/ae123a9bae03f7dde5c6d654412daf5a.html#Report-2
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.129 src/sys/rump/librump/rumpvfs/rumpfs.c:1.130
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.129 Fri Jun 13 15:45:02 2014
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Sun Aug 17 19:28:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.129 2014/06/13 15:45:02 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.130 2014/08/17 19:28:46 justin Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.129 2014/06/13 15:45:02 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.130 2014/08/17 19:28:46 justin Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1740,8 +1740,10 @@ rumpfs_mountfs(struct mount *mp)
rn = makeprivate(VDIR, RUMPFS_DEFAULTMODE, NODEV, DEV_BSIZE, false);
rn->rn_parent = rn;
- if ((error = makevnode(mp, rn, &rfsmp->rfsmp_rvp)) != 0)
+ if ((error = makevnode(mp, rn, &rfsmp->rfsmp_rvp)) != 0) {
+ kmem_free(rfsmp, sizeof(*rfsmp));
return error;
+ }
rfsmp->rfsmp_rvp->v_vflag |= VV_ROOT;
