ZEP: Add a bounds check

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 7a1b42e0b0c65e9e8fbe03df9bd23a9f0a80b2da..da95862b3c0b5150a4b324f0439caf4eb828f395 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -27,6 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
@@ -474,11 +475,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
         * Fail if we don't have enough data for the Hilscher pseudo-header.
         */
        ndo->ndo_protocol = "netanalyzer";
-       if (h->caplen < 4) {
-               ndo->ndo_ll_hdr_len += h->caplen;
-               nd_print_trunc(ndo);
-               return;
-       }
+       ND_TCHECK_LEN(p, 4);
 
        /* Skip the pseudo-header. */
        ndo->ndo_ll_hdr_len += 4;
@@ -506,11 +503,7 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
         * preamble, and SOF.
         */
        ndo->ndo_protocol = "netanalyzer_transparent";
-       if (h->caplen < 12) {
-               ndo->ndo_ll_hdr_len += h->caplen;
-               nd_print_trunc(ndo);
-               return;
-       }
+       ND_TCHECK_LEN(p, 12);
 
        /* Skip the pseudo-header, preamble, and SOF. */
        ndo->ndo_ll_hdr_len += 12;
@@ -571,6 +564,9 @@ ethertype_print(netdissect_options *ndo,
                        nd_print_trunc(ndo);
                        return (1);
                }
+               /* At least one byte is required */
+               /* FIXME: Reference for this byte? */
+               ND_TCHECK_LEN(p, 1);
                isoclns_print(ndo, p + 1, length - 1);
                return(1);