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

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

details:   https://anonhg.NetBSD.org/src/rev/eced2b95121d
branches:  netbsd-7-1
changeset: 800842:eced2b95121d
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 02 11:01:46 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1561):
        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.

diffstat:

 sys/netinet6/ip6_mroute.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 2147bfd1f341 -r eced2b95121d sys/netinet6/ip6_mroute.c
--- a/sys/netinet6/ip6_mroute.c Tue Jan 30 18:31:12 2018 +0000
+++ b/sys/netinet6/ip6_mroute.c Fri Feb 02 11:01:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_mroute.c,v 1.107 2014/05/17 21:26:20 rmind Exp $   */
+/*     $NetBSD: ip6_mroute.c,v 1.107.10.1 2018/02/02 11:01:46 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.107 2014/05/17 21:26:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.107.10.1 2018/02/02 11:01:46 martin Exp $");
 
 #include "opt_inet.h"
 #include "opt_mrouting.h"
@@ -1861,7 +1861,7 @@
                            (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 */