[src/netbsd-7]: src/sys Pull up following revision(s) (requested by maxv in t...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/38bde7500f08
branches:  netbsd-7
changeset: 798291:38bde7500f08
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 24 08:34:58 2014 +0000

description:
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

diffstat:

 sys/netinet6/ip6_output.c         |  6 ++++--
 sys/rump/librump/rumpvfs/rumpfs.c |  8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r c7fbb853a1e7 -r 38bde7500f08 sys/netinet6/ip6_output.c
--- a/sys/netinet6/ip6_output.c Sat Aug 23 03:47:10 2014 +0000
+++ b/sys/netinet6/ip6_output.c Sun Aug 24 08:34:58 2014 +0000
@@ -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 @@
                        optp = &in6p->in6p_outputopts;
                        error = ip6_pcbopt(optname, optbuf, optbuflen,
                            optp, kauth_cred_get(), uproto);
+
+                       free(optbuf, M_IP6OPT);
                        break;
                        }
 #undef OPTSET
diff -r c7fbb853a1e7 -r 38bde7500f08 sys/rump/librump/rumpvfs/rumpfs.c
--- a/sys/rump/librump/rumpvfs/rumpfs.c Sat Aug 23 03:47:10 2014 +0000
+++ b/sys/rump/librump/rumpvfs/rumpfs.c Sun Aug 24 08:34:58 2014 +0000
@@ -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 @@
 
        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;