mini_fo: add error pointer checks after dentry lookups to fix various crash bugs...

[openwrt.git] / package / busybox / patches / 460-truncated_ping_results.patch

diff --git a/package/busybox/patches/460-truncated_ping_results.patch b/package/busybox/patches/460-truncated_ping_results.patch
index 5479886..25f0555 100644 (file)
--- a/package/busybox/patches/460-truncated_ping_results.patch
+++ b/package/busybox/patches/460-truncated_ping_results.patch
@@ -1,8 +1,14 @@
-Index: busybox-1.7.2/networking/ping.c
-===================================================================
---- busybox-1.7.2.orig/networking/ping.c       2007-10-30 15:34:59.000000000 -0500
-+++ busybox-1.7.2/networking/ping.c    2007-10-30 15:35:05.000000000 -0500
-@@ -91,7 +91,7 @@
+--- a/networking/ping.c
++++ b/networking/ping.c
+@@ -79,6 +79,7 @@ static int in_cksum(unsigned short *buf,
+ /* simple version */
+ 
+ static char *hostname;
++static unsigned datalen = DEFDATALEN;
+ 
+ static void noresp(int ign UNUSED_PARAM)
+ {
+@@ -91,7 +92,7 @@ static void ping4(len_and_sockaddr *lsa)

        struct sockaddr_in pingaddr;
        struct icmp *pkt;
        int pingsock, c;
        struct sockaddr_in pingaddr;
        struct icmp *pkt;
        int pingsock, c;


@@ -10,8 +16,8 @@ Index: busybox-1.7.2/networking/ping.c
 +      char packet[datalen + ICMP_MINLEN + MAXIPLEN + MAXICMPLEN];
  
        pingsock = create_icmp_socket();
 +      char packet[datalen + ICMP_MINLEN + MAXIPLEN + MAXICMPLEN];
  
        pingsock = create_icmp_socket();

-       pingaddr = lsa->sin;
-@@ -101,7 +101,7 @@
+       pingaddr = lsa->u.sin;
+@@ -101,7 +102,7 @@ static void ping4(len_and_sockaddr *lsa)

        pkt->icmp_type = ICMP_ECHO;
        pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
  
        pkt->icmp_type = ICMP_ECHO;
        pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
  


@@ -20,7 +26,7 @@ Index: busybox-1.7.2/networking/ping.c
                           (struct sockaddr *) &pingaddr, sizeof(pingaddr));
  
        /* listen for replies */
                           (struct sockaddr *) &pingaddr, sizeof(pingaddr));
  
        /* listen for replies */

-@@ -135,7 +135,7 @@
+@@ -135,7 +136,7 @@ static void ping6(len_and_sockaddr *lsa)

        struct icmp6_hdr *pkt;
        int pingsock, c;
        int sockopt;
        struct icmp6_hdr *pkt;
        int pingsock, c;
        int sockopt;


@@ -28,8 +34,8 @@ Index: busybox-1.7.2/networking/ping.c
 +      char packet[datalen + ICMP_MINLEN + MAXIPLEN + MAXICMPLEN];
  
        pingsock = create_icmp6_socket();
 +      char packet[datalen + ICMP_MINLEN + MAXIPLEN + MAXICMPLEN];
  
        pingsock = create_icmp6_socket();

-       pingaddr = lsa->sin6;
-@@ -147,7 +147,7 @@
+       pingaddr = lsa->u.sin6;
+@@ -147,7 +148,7 @@ static void ping6(len_and_sockaddr *lsa)

        sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
        setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
  
        sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
        setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));