1 files changed, 7 insertions, 0 deletions

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 4cbef25bf73d4..1b79780b5625b 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -2661,10 +2661,17 @@ nolladdropt:;
 	m->m_pkthdr.len = m->m_len = p - (u_char *)ip6;
 
 	/* connect m0 to m */
+	m_tag_delete_chain(m0, NULL);
+	m0->m_flags &= ~M_PKTHDR;
 	m->m_next = m0;
 	m->m_pkthdr.len = m->m_len + m0->m_len;
+	m0 = NULL;
     }
 noredhdropt:;
+	if (m0) {
+		m_freem(m0);
+		m0 = NULL;
+	}
 
 	if (IN6_IS_ADDR_LINKLOCAL(&sip6->ip6_src))
 		sip6->ip6_src.s6_addr16[1] = 0;