Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/netinet6 Pull up following revision(s) (requested by ...



details:   https://anonhg.NetBSD.org/src/rev/44d66462072f
branches:  netbsd-8
changeset: 434587:44d66462072f
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 02 10:54:02 2018 +0000

description:
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.

diffstat:

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

diffs (27 lines):

diff -r 64ad26773366 -r 44d66462072f sys/netinet6/ip6_mroute.c
--- a/sys/netinet6/ip6_mroute.c Wed Jan 31 19:40:52 2018 +0000
+++ b/sys/netinet6/ip6_mroute.c Fri Feb 02 10:54:02 2018 +0000
@@ -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 @@
                            (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 */



Home | Main Index | Thread Index | Old Index