CVE-2017-13002/AODV: Add some missing bounds checks.

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index 76f39fe084a681e1c8a5c8e32cf9d01d6fabbc7e..eff97c469074d215360ea8666b1389d521e6f348 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -19,20 +19,21 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: Address Resolution Protocol (ARP) printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include <string.h>
 
 
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "ether.h"
 #include "ethertype.h"
 #include "addrtoname.h"
 #include "ether.h"
 #include "ethertype.h"

-#include "extract.h"                   /* must come after interface.h */
+#include "extract.h"

 
 static const char tstr[] = "[|ARP]";
 
 
 static const char tstr[] = "[|ARP]";
 


@@ -176,7 +177,17 @@ struct  atmarp_pkthdr {
 #define ATMTSA(ap) (aar_tsa(ap))
 #define ATMTPA(ap) (aar_tpa(ap))
 
 #define ATMTSA(ap) (aar_tsa(ap))
 #define ATMTPA(ap) (aar_tpa(ap))
 

-static u_char ezero[6];
+static int
+isnonzero(const u_char *a, size_t len)
+{
+       while (len > 0) {
+               if (*a != 0)
+                       return (1);
+               a++;
+               len--;
+       }
+       return (0);
+}

 
 static void
 atmarp_addr_print(netdissect_options *ndo,
 
 static void
 atmarp_addr_print(netdissect_options *ndo,


@@ -357,7 +368,7 @@ arp_print(netdissect_options *ndo,
 
        case ARPOP_REQUEST:
                ND_PRINT((ndo, "who-has %s", ipaddr_string(ndo, TPA(ap))));
 
        case ARPOP_REQUEST:
                ND_PRINT((ndo, "who-has %s", ipaddr_string(ndo, TPA(ap))));

-               if (memcmp((const char *)ezero, (const char *)THA(ap), HRD_LEN(ap)) != 0)
+               if (isnonzero((const u_char *)THA(ap), HRD_LEN(ap)))

                        ND_PRINT((ndo, " (%s)",
                                  linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap))));
                ND_PRINT((ndo, " tell %s", ipaddr_string(ndo, SPA(ap))));
                        ND_PRINT((ndo, " (%s)",
                                  linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap))));
                ND_PRINT((ndo, " tell %s", ipaddr_string(ndo, SPA(ap))));