Date: Mon, 5 Feb 2018 09:25:53 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r328878 - stable/10/sys/netinet6 Message-ID: <201802050925.w159PriS021794@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Mon Feb 5 09:25:53 2018 New Revision: 328878 URL: https://svnweb.freebsd.org/changeset/base/328878 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/10/sys/netinet6/ip6_mroute.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet6/ip6_mroute.c ============================================================================== --- stable/10/sys/netinet6/ip6_mroute.c Mon Feb 5 09:25:02 2018 (r328877) +++ stable/10/sys/netinet6/ip6_mroute.c Mon Feb 5 09:25:53 2018 (r328878) @@ -1840,7 +1840,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?201802050925.w159PriS021794>