Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Feb 2018 07:39:34 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r328770 - head/sys/netinet6
Message-ID:  <201802020739.w127dZAD092660@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Fri Feb  2 07:39:34 2018
New Revision: 328770
URL: https://svnweb.freebsd.org/changeset/base/328770

Log:
  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>
  MFC after:	3 days

Modified:
  head/sys/netinet6/ip6_mroute.c

Modified: head/sys/netinet6/ip6_mroute.c
==============================================================================
--- head/sys/netinet6/ip6_mroute.c	Fri Feb  2 06:32:26 2018	(r328769)
+++ head/sys/netinet6/ip6_mroute.c	Fri Feb  2 07:39:34 2018	(r328770)
@@ -1857,7 +1857,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 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802020739.w127dZAD092660>