CVS commit: [netbsd-7] src/sys

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Sun Aug 24 08:34:59 UTC 2014

Modified Files:
        src/sys/netinet6 [netbsd-7]: ip6_output.c
        src/sys/rump/librump/rumpvfs [netbsd-7]: rumpfs.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #51):
        sys/netinet6/ip6_output.c: revision 1.158
        sys/rump/librump/rumpvfs/rumpfs.c: revision 1.130
Fix memory leaks in error cases


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.157.2.1 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.129 -r1.129.2.1 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/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.157 src/sys/netinet6/ip6_output.c:1.157.2.1
--- src/sys/netinet6/ip6_output.c:1.157	Fri May 30 01:39:03 2014
+++ src/sys/netinet6/ip6_output.c	Sun Aug 24 08:34:58 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_output.c,v 1.157 2014/05/30 01:39:03 christos Exp $	*/
+/*	$NetBSD: ip6_output.c,v 1.157.2.1 2014/08/24 08:34:58 martin Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.157 2014/05/30 01:39:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.157.2.1 2014/08/24 08:34:58 martin Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1601,6 +1601,8 @@ else 					\
 			optp = &in6p->in6p_outputopts;
 			error = ip6_pcbopt(optname, optbuf, optbuflen,
 			    optp, kauth_cred_get(), uproto);
+
+			free(optbuf, M_IP6OPT);
 			break;
 			}
 #undef OPTSET

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.129.2.1
--- 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 24 08:34:58 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpfs.c,v 1.129 2014/06/13 15:45:02 pooka Exp $	*/
+/*	$NetBSD: rumpfs.c,v 1.129.2.1 2014/08/24 08:34:58 martin 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.129.2.1 2014/08/24 08:34:58 martin 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;