From: mickey <mickey@openbsd.org>
Date: Thu, 9 May 1996 14:33:32 +0000 (+0000)
Subject: revert icmp len fix, since i experience 'icmp len'
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bd23f126f51a42e7a4d50e8514675552e4892fd3;p=openbsd

revert icmp len fix, since i experience 'icmp len'
panics replying to udp.
---

diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index acbe07ca094..82452068c09 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_icmp.c,v 1.4 1996/05/07 15:20:23 mickey Exp $	*/
+/*	$OpenBSD: ip_icmp.c,v 1.5 1996/05/09 14:33:32 mickey Exp $	*/
 /*	$NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $	*/
 
 /*
@@ -120,7 +120,7 @@ icmp_error(n, type, code, dest, destifp)
 	m = m_gethdr(M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		goto freeit;
-	icmplen = oiplen + oip->ip_len;
+	icmplen = oiplen + min(8,oip->ip_len);
 	m->m_len = icmplen + ICMP_MINLEN;
 	MH_ALIGN(m, m->m_len);
 	icp = mtod(m, struct icmp *);