Module Name: src Committed By: msaitoh Date: Wed Aug 27 14:45:11 UTC 2014
Modified Files: src/sys/netinet6 [netbsd-6-1]: ip6_output.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.145.8.1 src/sys/netinet6/ip6_output.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.145 src/sys/netinet6/ip6_output.c:1.145.8.1 --- src/sys/netinet6/ip6_output.c:1.145 Sun Feb 5 00:41:15 2012 +++ src/sys/netinet6/ip6_output.c Wed Aug 27 14:45:11 2014 @@ -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.8.1 2014/08/27 14:45:11 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.8.1 2014/08/27 14:45:11 msaitoh Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -1781,6 +1781,8 @@ else \ optp = &in6p->in6p_outputopts; error = ip6_pcbopt(optname, optbuf, optbuflen, optp, kauth_cred_get(), uproto); + + free(optbuf, M_IP6OPT); break; } #undef OPTSET