Handle very large -f files by rejecting them.

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index cdd4a650513a3c3b237d8fc14e69658b25461f0b..abc19b80704d64431d5e673a1fbe207b1fc74e1d 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -21,14 +21,15 @@
  * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
  */
 
  * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: Attached Resource Computer NETwork (ARCNET) 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 "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 
 /*
 #include "extract.h"
 
 /*


@@ -181,7 +182,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        u_int seqid = 0;
        u_char arc_type;
 
        u_int seqid = 0;
        u_char arc_type;
 

-       if (caplen < ARC_HDRLEN) {
+       if (caplen < ARC_HDRLEN || length < ARC_HDRLEN) {

                ND_PRINT((ndo, "[|arcnet]"));
                return (caplen);
        }
                ND_PRINT((ndo, "[|arcnet]"));
                return (caplen);
        }


@@ -202,14 +203,14 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        }
 
        if (phds) {
        }
 
        if (phds) {

-               if (caplen < ARC_HDRNEWLEN) {
+               if (caplen < ARC_HDRNEWLEN || length < ARC_HDRNEWLEN) {

                        arcnet_print(ndo, p, length, 0, 0, 0);
                        ND_PRINT((ndo, "[|phds]"));
                        return (caplen);
                }
 
                if (ap->arc_flag == 0xff) {
                        arcnet_print(ndo, p, length, 0, 0, 0);
                        ND_PRINT((ndo, "[|phds]"));
                        return (caplen);
                }
 
                if (ap->arc_flag == 0xff) {

-                       if (caplen < ARC_HDRNEWLEN_EXC) {
+                       if (caplen < ARC_HDRNEWLEN_EXC || length < ARC_HDRNEWLEN_EXC) {

                                arcnet_print(ndo, p, length, 0, 0, 0);
                                ND_PRINT((ndo, "[|phds extended]"));
                                return (caplen);
                                arcnet_print(ndo, p, length, 0, 0, 0);
                                ND_PRINT((ndo, "[|phds extended]"));
                                return (caplen);


@@ -268,7 +269,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
        int archdrlen = 0;
        u_char arc_type;
 
        int archdrlen = 0;
        u_char arc_type;
 

-       if (caplen < ARC_LINUX_HDRLEN) {
+       if (caplen < ARC_LINUX_HDRLEN || length < ARC_LINUX_HDRLEN) {

                ND_PRINT((ndo, "[|arcnet]"));
                return (caplen);
        }
                ND_PRINT((ndo, "[|arcnet]"));
                return (caplen);
        }


@@ -279,7 +280,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
        switch (arc_type) {
        default:
                archdrlen = ARC_LINUX_HDRNEWLEN;
        switch (arc_type) {
        default:
                archdrlen = ARC_LINUX_HDRNEWLEN;

-               if (caplen < ARC_LINUX_HDRNEWLEN) {
+               if (caplen < ARC_LINUX_HDRNEWLEN || length < ARC_LINUX_HDRNEWLEN) {

                        ND_PRINT((ndo, "[|arcnet]"));
                        return (caplen);
                }
                        ND_PRINT((ndo, "[|arcnet]"));
                        return (caplen);
                }


@@ -326,11 +327,9 @@ arcnet_encap_print(netdissect_options *ndo, u_char arctype, const u_char *p,
                ip_print(ndo, p, length);
                return (1);
 
                ip_print(ndo, p, length);
                return (1);
 

-#ifdef INET6

        case ARCTYPE_INET6:
                ip6_print(ndo, p, length);
                return (1);
        case ARCTYPE_INET6:
                ip6_print(ndo, p, length);
                return (1);

-#endif /*INET6*/

 
        case ARCTYPE_ARP_OLD:
        case ARCTYPE_ARP:
 
        case ARCTYPE_ARP_OLD:
        case ARCTYPE_ARP: