svn commit: r328877 - stable/11/sys/netinet6

[Andrey V. Elsukov]

Author: ae
Date: Mon Feb  5 09:25:02 2018
New Revision: 328877
URL: https://svnweb.freebsd.org/changeset/base/328877

Log:
  MFC r328770:
    Merge r1.120 from NetBSD:
      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.
  
    Reported by:	Maxime Villard <max at m00nbsd dot net>

Modified:
  stable/11/sys/netinet6/ip6_mroute.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet6/ip6_mroute.c
==============================================================================
--- stable/11/sys/netinet6/ip6_mroute.c	Mon Feb  5 09:22:07 2018	(r328876)
+++ stable/11/sys/netinet6/ip6_mroute.c	Mon Feb  5 09:25:02 2018	(r328877)
@@ -1854,7 +1854,7 @@ pim6_input(struct mbuf **mp, int *offp, int proto)
 			    "of the inner packet",
 			    (eip6->ip6_vfc & IPV6_VERSION));
 			m_freem(m);
-			return (IPPROTO_NONE);
+			return (IPPROTO_DONE);
 		}
 
 		/* verify the inner packet is destined to a mcast group */