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

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

details:   https://anonhg.NetBSD.org/src/rev/2ef9cbc066bf
branches:  netbsd-6-1
changeset: 776287:2ef9cbc066bf
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 02 11:08:30 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1524):
        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 6261526706ea -r 2ef9cbc066bf sys/netinet6/ip6_mroute.c
--- a/sys/netinet6/ip6_mroute.c Tue Jan 30 22:10:56 2018 +0000
+++ b/sys/netinet6/ip6_mroute.c Fri Feb 02 11:08:30 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_mroute.c,v 1.103 2011/12/31 20:41:59 christos Exp $        */
+/*     $NetBSD: ip6_mroute.c,v 1.103.16.1 2018/02/02 11:08:30 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.103 2011/12/31 20:41:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.103.16.1 2018/02/02 11:08:30 martin Exp $");
 
 #include "opt_inet.h"
 #include "opt_mrouting.h"
@@ -1864,7 +1864,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 */