summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-08-07 09:11:25 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-08-07 09:11:25 +0000
commit37044f9dc4154656f80f64756350415c67477404 (patch)
treea28647827da92fbebd8b9f4ae718e06e24899e2b
parent4da4e9835cce6475e47d3efe3797f1ec48fbd667 (diff)
m_cat might free mbuf passed as 2nd arg. compute pkthdr.len before m_cat.
from kame
-rw-r--r--sys/netinet6/icmp6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index eaa63cc3d3f..c15081e71ef 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.73 2003/06/24 07:55:12 itojun Exp $ */
+/* $OpenBSD: icmp6.c,v 1.74 2003/08/07 09:11:24 itojun Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -2603,8 +2603,8 @@ icmp6_redirect_output(m0, rt)
m->m_pkthdr.len = m->m_len = p - (u_char *)ip6;
/* connect m0 to m */
- m_cat(m, m0);
m->m_pkthdr.len += m0->m_pkthdr.len;
+ m_cat(m, m0);
m0 = NULL;
}
noredhdropt: