Module Name: src
Committed By: martin
Date: Fri Feb 2 10:54:02 UTC 2018
Modified Files:
src/sys/netinet6 [netbsd-8]: ip6_mroute.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #530):
sys/netinet6/ip6_mroute.c: revision 1.120
Fix a pretty simple, yet pretty tragic typo: we should return IPPROTO_DONE,
not IPPROTO_NONE. With IPPROTO_NONE we will keep parsing the header chain
on an mbuf that was already freed.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.119.6.1 src/sys/netinet6/ip6_mroute.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_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.119 src/sys/netinet6/ip6_mroute.c:1.119.6.1
--- src/sys/netinet6/ip6_mroute.c:1.119 Wed Mar 1 08:54:12 2017
+++ src/sys/netinet6/ip6_mroute.c Fri Feb 2 10:54:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.119 2017/03/01 08:54:12 ozaki-r Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.119.6.1 2018/02/02 10:54:02 martin Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.119 2017/03/01 08:54:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.119.6.1 2018/02/02 10:54:02 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1886,7 +1886,7 @@ pim6_input(struct mbuf **mp, int *offp,
(eip6->ip6_vfc & IPV6_VERSION));
#endif
m_freem(m);
- return (IPPROTO_NONE);
+ return (IPPROTO_DONE);
}
/* verify the inner packet is destined to a mcast group */
