diff options
author | ae <ae@FreeBSD.org> | 2018-02-05 09:25:02 +0000 |
---|---|---|
committer | ae <ae@FreeBSD.org> | 2018-02-05 09:25:02 +0000 |
commit | 2fffd1438f15bf2cd47a008f00b45e84f811e0ea (patch) | |
tree | 89ec83aba437498b0b18523a701023b1f3d29130 | |
parent | 2f9dcccddd60b1712d33383dd42806164ef72050 (diff) | |
download | FreeBSD-src-2fffd1438f15bf2cd47a008f00b45e84f811e0ea.zip FreeBSD-src-2fffd1438f15bf2cd47a008f00b45e84f811e0ea.tar.gz |
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>
-rw-r--r-- | sys/netinet6/ip6_mroute.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 3ae900d..206cebf 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -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 */ |