[src/netbsd-6-0]: src/sys/netinet6 Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/03ab64ef4ab7
branches:  netbsd-6-0
changeset: 774981:03ab64ef4ab7
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Aug 27 14:45:59 2014 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1114):
        sys/netinet6/ip6_output.c                       1.158 via patch

Fix a memory leak in calling setsockopt() on an INET6 socket.

diffstat:

 sys/netinet6/ip6_output.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 2a997144c4f5 -r 03ab64ef4ab7 sys/netinet6/ip6_output.c
--- a/sys/netinet6/ip6_output.c Sat Aug 16 00:59:29 2014 +0000
+++ b/sys/netinet6/ip6_output.c Wed Aug 27 14:45:59 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_output.c,v 1.145 2012/02/05 00:41:15 rmind Exp $   */
+/*     $NetBSD: ip6_output.c,v 1.145.6.1 2014/08/27 14:45:59 msaitoh 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.145 2012/02/05 00:41:15 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.145.6.1 2014/08/27 14:45:59 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1781,6 +1781,8 @@
                        optp = &in6p->in6p_outputopts;
                        error = ip6_pcbopt(optname, optbuf, optbuflen,
                            optp, kauth_cred_get(), uproto);
+
+                       free(optbuf, M_IP6OPT);
                        break;
                        }
 #undef OPTSET