Module Name: src
Committed By: msaitoh
Date: Wed Aug 27 13:44:34 UTC 2014
Modified Files:
src/sys/netinet6 [netbsd-5]: ip6_output.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1920):
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.135.2.1 -r1.135.2.2 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.135.2.1 src/sys/netinet6/ip6_output.c:1.135.2.2
--- src/sys/netinet6/ip6_output.c:1.135.2.1 Mon Apr 20 22:56:04 2009
+++ src/sys/netinet6/ip6_output.c Wed Aug 27 13:44:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.135.2.1 2009/04/20 22:56:04 snj Exp $ */
+/* $NetBSD: ip6_output.c,v 1.135.2.2 2014/08/27 13:44:34 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.135.2.1 2009/04/20 22:56:04 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.135.2.2 2014/08/27 13:44:34 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1794,6 +1794,8 @@ else \
optp = &in6p->in6p_outputopts;
error = ip6_pcbopt(optname, optbuf, optbuflen,
optp, privileged, uproto);
+
+ free(optbuf, M_IP6OPT);
break;
}
#undef OPTSET
