From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 4 Mar 2007 14:36:34 +0000 (+0000)
Subject: hopefully fix ping bugs introduced in [6443]
X-Git-Tag: reboot~29784
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=07cb246bd750bf7798b2debf609d304e8d48fba5;p=openwrt%2Fstaging%2Fblogic.git

hopefully fix ping bugs introduced in [6443]

SVN-Revision: 6505
---

diff --git a/package/busybox/patches/450-truncated_ping_results.patch b/package/busybox/patches/450-truncated_ping_results.patch
index 30e86701a3cd..f60a1a9c0277 100644
--- a/package/busybox/patches/450-truncated_ping_results.patch
+++ b/package/busybox/patches/450-truncated_ping_results.patch
@@ -5,7 +5,7 @@
  	struct icmp *pkt;
  	int pingsock, c;
 -	char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
-+	char packet[datalen + MAXIPLEN + MAXICMPLEN];
++	char packet[datalen + ICMP_MINLEN + MAXIPLEN + MAXICMPLEN];
  
  	pingsock = create_icmp_socket();
  
@@ -18,17 +18,6 @@
  			   (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
  
  	if (c < 0) {
-@@ -257,8 +257,8 @@
- 
- 	gettimeofday(&tv, NULL);
- 
--	/* discard if too short */
--	if (sz < (datalen + ICMP_MINLEN))
-+	/* discard if too short / long */
-+	if (sz < (datalen + ICMP_MINLEN) || sz > (MAXICMPLEN))
- 		return;
- 
- 	/* check IP header */
 @@ -274,6 +274,10 @@
  		++nreceived;
  		tp = (struct timeval *) icmppkt->icmp_data;