Handle very large -f files by rejecting them.

[tcpdump] / print-sflow.c

diff --git a/print-sflow.c b/print-sflow.c
index 708f76052a115ab8bc7a88c062bf3f802b9a2ad5..dcaf28e8648c1dbd607a0a9ff7291b30eb19b6c1 100644 (file)
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -12,20 +12,22 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *

- * The SFLOW protocol as per http://www.sflow.org/developers/specifications.php
- *

  * Original code by Carles Kishimoto <[email protected]>
  *
  * Expansion and refactoring by Rick Jones <[email protected]>
  */
 
  * Original code by Carles Kishimoto <[email protected]>
  *
  * Expansion and refactoring by Rick Jones <[email protected]>
  */
 

+/* \summary: sFlow protocol printer */
+
+/* specification: http://www.sflow.org/developers/specifications.php */
+

 #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 "addrtoname.h"
 
 #include "extract.h"
 #include "addrtoname.h"
 


@@ -303,8 +305,8 @@ print_sflow_counter_generic(netdissect_options *ndo,
     if (len < sizeof(struct sflow_generic_counter_t))
        return 1;
 
     if (len < sizeof(struct sflow_generic_counter_t))
        return 1;
 

-

     sflow_gen_counter = (const struct sflow_generic_counter_t *)pointer;
     sflow_gen_counter = (const struct sflow_generic_counter_t *)pointer;

+    ND_TCHECK(*sflow_gen_counter);

     ND_PRINT((ndo, "\n\t      ifindex %u, iftype %u, ifspeed %" PRIu64 ", ifdirection %u (%s)",
           EXTRACT_32BITS(sflow_gen_counter->ifindex),
           EXTRACT_32BITS(sflow_gen_counter->iftype),
     ND_PRINT((ndo, "\n\t      ifindex %u, iftype %u, ifspeed %" PRIu64 ", ifdirection %u (%s)",
           EXTRACT_32BITS(sflow_gen_counter->ifindex),
           EXTRACT_32BITS(sflow_gen_counter->iftype),


@@ -338,6 +340,9 @@ print_sflow_counter_generic(netdissect_options *ndo,
           EXTRACT_32BITS(sflow_gen_counter->ifpromiscmode)));
 
     return 0;
           EXTRACT_32BITS(sflow_gen_counter->ifpromiscmode)));
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -350,6 +355,7 @@ print_sflow_counter_ethernet(netdissect_options *ndo,
        return 1;
 
     sflow_eth_counter = (const struct sflow_ethernet_counter_t *)pointer;
        return 1;
 
     sflow_eth_counter = (const struct sflow_ethernet_counter_t *)pointer;

+    ND_TCHECK(*sflow_eth_counter);

     ND_PRINT((ndo, "\n\t      align errors %u, fcs errors %u, single collision %u, multiple collision %u, test error %u",
           EXTRACT_32BITS(sflow_eth_counter->alignerrors),
           EXTRACT_32BITS(sflow_eth_counter->fcserrors),
     ND_PRINT((ndo, "\n\t      align errors %u, fcs errors %u, single collision %u, multiple collision %u, test error %u",
           EXTRACT_32BITS(sflow_eth_counter->alignerrors),
           EXTRACT_32BITS(sflow_eth_counter->fcserrors),


@@ -368,6 +374,9 @@ print_sflow_counter_ethernet(netdissect_options *ndo,
           EXTRACT_32BITS(sflow_eth_counter->symbol_errors)));
 
     return 0;
           EXTRACT_32BITS(sflow_eth_counter->symbol_errors)));
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -387,6 +396,7 @@ print_sflow_counter_basevg(netdissect_options *ndo,
        return 1;
 
     sflow_100basevg_counter = (const struct sflow_100basevg_counter_t *)pointer;
        return 1;
 
     sflow_100basevg_counter = (const struct sflow_100basevg_counter_t *)pointer;

+    ND_TCHECK(*sflow_100basevg_counter);

     ND_PRINT((ndo, "\n\t      in high prio frames %u, in high prio octets %" PRIu64,
           EXTRACT_32BITS(sflow_100basevg_counter->in_highpriority_frames),
           EXTRACT_64BITS(sflow_100basevg_counter->in_highpriority_octets)));
     ND_PRINT((ndo, "\n\t      in high prio frames %u, in high prio octets %" PRIu64,
           EXTRACT_32BITS(sflow_100basevg_counter->in_highpriority_frames),
           EXTRACT_64BITS(sflow_100basevg_counter->in_highpriority_octets)));


@@ -411,6 +421,9 @@ print_sflow_counter_basevg(netdissect_options *ndo,
           EXTRACT_64BITS(sflow_100basevg_counter->hc_out_highpriority_octets)));
 
     return 0;
           EXTRACT_64BITS(sflow_100basevg_counter->hc_out_highpriority_octets)));
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -423,6 +436,7 @@ print_sflow_counter_vlan(netdissect_options *ndo,
        return 1;
 
     sflow_vlan_counter = (const struct sflow_vlan_counter_t *)pointer;
        return 1;
 
     sflow_vlan_counter = (const struct sflow_vlan_counter_t *)pointer;

+    ND_TCHECK(*sflow_vlan_counter);

     ND_PRINT((ndo, "\n\t      vlan_id %u, octets %" PRIu64
           ", unicast_pkt %u, multicast_pkt %u, broadcast_pkt %u, discards %u",
           EXTRACT_32BITS(sflow_vlan_counter->vlan_id),
     ND_PRINT((ndo, "\n\t      vlan_id %u, octets %" PRIu64
           ", unicast_pkt %u, multicast_pkt %u, broadcast_pkt %u, discards %u",
           EXTRACT_32BITS(sflow_vlan_counter->vlan_id),


@@ -433,6 +447,9 @@ print_sflow_counter_vlan(netdissect_options *ndo,
           EXTRACT_32BITS(sflow_vlan_counter->discards)));
 
     return 0;
           EXTRACT_32BITS(sflow_vlan_counter->discards)));
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 struct sflow_processor_counter_t {
 }
 
 struct sflow_processor_counter_t {


@@ -453,6 +470,7 @@ print_sflow_counter_processor(netdissect_options *ndo,
        return 1;
 
     sflow_processor_counter = (const struct sflow_processor_counter_t *)pointer;
        return 1;
 
     sflow_processor_counter = (const struct sflow_processor_counter_t *)pointer;

+    ND_TCHECK(*sflow_processor_counter);

     ND_PRINT((ndo, "\n\t      5sec %u, 1min %u, 5min %u, total_mem %" PRIu64
           ", total_mem %" PRIu64,
           EXTRACT_32BITS(sflow_processor_counter->five_sec_util),
     ND_PRINT((ndo, "\n\t      5sec %u, 1min %u, 5min %u, total_mem %" PRIu64
           ", total_mem %" PRIu64,
           EXTRACT_32BITS(sflow_processor_counter->five_sec_util),


@@ -462,6 +480,9 @@ print_sflow_counter_processor(netdissect_options *ndo,
           EXTRACT_64BITS(sflow_processor_counter->free_memory)));
 
     return 0;
           EXTRACT_64BITS(sflow_processor_counter->free_memory)));
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -485,6 +506,7 @@ sflow_print_counter_records(netdissect_options *ndo,
        if (tlen < sizeof(struct sflow_counter_record_t))
            return 1;
        sflow_counter_record = (const struct sflow_counter_record_t *)tptr;
        if (tlen < sizeof(struct sflow_counter_record_t))
            return 1;
        sflow_counter_record = (const struct sflow_counter_record_t *)tptr;

+       ND_TCHECK(*sflow_counter_record);

 
        enterprise = EXTRACT_32BITS(sflow_counter_record->format);
        counter_type = enterprise & 0x0FFF;
 
        enterprise = EXTRACT_32BITS(sflow_counter_record->format);
        counter_type = enterprise & 0x0FFF;


@@ -540,6 +562,9 @@ sflow_print_counter_records(netdissect_options *ndo,
     }
 
     return 0;
     }
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -552,11 +577,11 @@ sflow_print_counter_sample(netdissect_options *ndo,
     u_int           type;
     u_int           index;
 
     u_int           type;
     u_int           index;
 

-

     if (len < sizeof(struct sflow_counter_sample_t))
        return 1;
 
     sflow_counter_sample = (const struct sflow_counter_sample_t *)pointer;
     if (len < sizeof(struct sflow_counter_sample_t))
        return 1;
 
     sflow_counter_sample = (const struct sflow_counter_sample_t *)pointer;

+    ND_TCHECK(*sflow_counter_sample);

 
     typesource = EXTRACT_32BITS(sflow_counter_sample->typesource);
     nrecords   = EXTRACT_32BITS(sflow_counter_sample->records);
 
     typesource = EXTRACT_32BITS(sflow_counter_sample->typesource);
     nrecords   = EXTRACT_32BITS(sflow_counter_sample->records);


@@ -573,6 +598,8 @@ sflow_print_counter_sample(netdissect_options *ndo,
                                       len - sizeof(struct sflow_counter_sample_t),
                                       nrecords);
 
                                       len - sizeof(struct sflow_counter_sample_t),
                                       nrecords);
 

+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -587,6 +614,7 @@ sflow_print_expanded_counter_sample(netdissect_options *ndo,
        return 1;
 
     sflow_expanded_counter_sample = (const struct sflow_expanded_counter_sample_t *)pointer;
        return 1;
 
     sflow_expanded_counter_sample = (const struct sflow_expanded_counter_sample_t *)pointer;

+    ND_TCHECK(*sflow_expanded_counter_sample);

 
     nrecords = EXTRACT_32BITS(sflow_expanded_counter_sample->records);
 
 
     nrecords = EXTRACT_32BITS(sflow_expanded_counter_sample->records);
 


@@ -600,6 +628,8 @@ sflow_print_expanded_counter_sample(netdissect_options *ndo,
                                       len - sizeof(struct sflow_expanded_counter_sample_t),
                                       nrecords);
 
                                       len - sizeof(struct sflow_expanded_counter_sample_t),
                                       nrecords);
 

+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -612,6 +642,7 @@ print_sflow_raw_packet(netdissect_options *ndo,
        return 1;
 
     sflow_flow_raw = (const struct sflow_expanded_flow_raw_t *)pointer;
        return 1;
 
     sflow_flow_raw = (const struct sflow_expanded_flow_raw_t *)pointer;

+    ND_TCHECK(*sflow_flow_raw);

     ND_PRINT((ndo, "\n\t      protocol %s (%u), length %u, stripped bytes %u, header_size %u",
           tok2str(sflow_flow_raw_protocol_values,"Unknown",EXTRACT_32BITS(sflow_flow_raw->protocol)),
           EXTRACT_32BITS(sflow_flow_raw->protocol),
     ND_PRINT((ndo, "\n\t      protocol %s (%u), length %u, stripped bytes %u, header_size %u",
           tok2str(sflow_flow_raw_protocol_values,"Unknown",EXTRACT_32BITS(sflow_flow_raw->protocol)),
           EXTRACT_32BITS(sflow_flow_raw->protocol),


@@ -623,6 +654,9 @@ print_sflow_raw_packet(netdissect_options *ndo,
        assuming of course there is wnough data present to do so... */
 
     return 0;
        assuming of course there is wnough data present to do so... */
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -635,12 +669,16 @@ print_sflow_ethernet_frame(netdissect_options *ndo,
        return 1;
 
     sflow_ethernet_frame = (const struct sflow_ethernet_frame_t *)pointer;
        return 1;
 
     sflow_ethernet_frame = (const struct sflow_ethernet_frame_t *)pointer;

+    ND_TCHECK(*sflow_ethernet_frame);

 
     ND_PRINT((ndo, "\n\t      frame len %u, type %u",
           EXTRACT_32BITS(sflow_ethernet_frame->length),
           EXTRACT_32BITS(sflow_ethernet_frame->type)));
 
     return 0;
 
     ND_PRINT((ndo, "\n\t      frame len %u, type %u",
           EXTRACT_32BITS(sflow_ethernet_frame->length),
           EXTRACT_32BITS(sflow_ethernet_frame->type)));
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -653,6 +691,7 @@ print_sflow_extended_switch_data(netdissect_options *ndo,
        return 1;
 
     sflow_extended_sw_data = (const struct sflow_extended_switch_data_t *)pointer;
        return 1;
 
     sflow_extended_sw_data = (const struct sflow_extended_switch_data_t *)pointer;

+    ND_TCHECK(*sflow_extended_sw_data);

     ND_PRINT((ndo, "\n\t      src vlan %u, src pri %u, dst vlan %u, dst pri %u",
           EXTRACT_32BITS(sflow_extended_sw_data->src_vlan),
           EXTRACT_32BITS(sflow_extended_sw_data->src_pri),
     ND_PRINT((ndo, "\n\t      src vlan %u, src pri %u, dst vlan %u, dst pri %u",
           EXTRACT_32BITS(sflow_extended_sw_data->src_vlan),
           EXTRACT_32BITS(sflow_extended_sw_data->src_pri),


@@ -660,6 +699,9 @@ print_sflow_extended_switch_data(netdissect_options *ndo,
           EXTRACT_32BITS(sflow_extended_sw_data->dst_pri)));
 
     return 0;
           EXTRACT_32BITS(sflow_extended_sw_data->dst_pri)));
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -684,6 +726,7 @@ sflow_print_flow_records(netdissect_options *ndo,
            return 1;
 
        sflow_flow_record = (const struct sflow_flow_record_t *)tptr;
            return 1;
 
        sflow_flow_record = (const struct sflow_flow_record_t *)tptr;

+       ND_TCHECK(*sflow_flow_record);

 
        /* so, the funky encoding means we cannot blythly mask-off
           bits, we must also check the enterprise. */
 
        /* so, the funky encoding means we cannot blythly mask-off
           bits, we must also check the enterprise. */


@@ -746,6 +789,9 @@ sflow_print_flow_records(netdissect_options *ndo,
     }
 
     return 0;
     }
 
     return 0;

+
+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -761,7 +807,8 @@ sflow_print_flow_sample(netdissect_options *ndo,
     if (len < sizeof(struct sflow_flow_sample_t))
        return 1;
 
     if (len < sizeof(struct sflow_flow_sample_t))
        return 1;
 

-    sflow_flow_sample = (struct sflow_flow_sample_t *)pointer;
+    sflow_flow_sample = (const struct sflow_flow_sample_t *)pointer;
+    ND_TCHECK(*sflow_flow_sample);

 
     typesource = EXTRACT_32BITS(sflow_flow_sample->typesource);
     nrecords = EXTRACT_32BITS(sflow_flow_sample->records);
 
     typesource = EXTRACT_32BITS(sflow_flow_sample->typesource);
     nrecords = EXTRACT_32BITS(sflow_flow_sample->records);


@@ -783,6 +830,8 @@ sflow_print_flow_sample(netdissect_options *ndo,
                                    len - sizeof(struct sflow_flow_sample_t),
                                    nrecords);
 
                                    len - sizeof(struct sflow_flow_sample_t),
                                    nrecords);
 

+trunc:
+    return 1;

 }
 
 static int
 }
 
 static int


@@ -796,6 +845,7 @@ sflow_print_expanded_flow_sample(netdissect_options *ndo,
        return 1;
 
     sflow_expanded_flow_sample = (const struct sflow_expanded_flow_sample_t *)pointer;
        return 1;
 
     sflow_expanded_flow_sample = (const struct sflow_expanded_flow_sample_t *)pointer;

+    ND_TCHECK(*sflow_expanded_flow_sample);

 
     nrecords = EXTRACT_32BITS(sflow_expanded_flow_sample->records);
 
 
     nrecords = EXTRACT_32BITS(sflow_expanded_flow_sample->records);
 


@@ -812,6 +862,8 @@ sflow_print_expanded_flow_sample(netdissect_options *ndo,
                                    len - sizeof(struct sflow_expanded_flow_sample_t),
                                    nrecords);
 
                                    len - sizeof(struct sflow_expanded_flow_sample_t),
                                    nrecords);
 

+trunc:
+    return 1;

 }
 
 void
 }
 
 void


@@ -826,10 +878,17 @@ sflow_print(netdissect_options *ndo,
     uint32_t sflow_sample_type, sflow_sample_len;
     uint32_t nsamples;
 
     uint32_t sflow_sample_type, sflow_sample_len;
     uint32_t nsamples;
 

-

     tptr = pptr;
     tlen = len;
     sflow_datagram = (const struct sflow_datagram_t *)pptr;
     tptr = pptr;
     tlen = len;
     sflow_datagram = (const struct sflow_datagram_t *)pptr;

+    if (len < sizeof(struct sflow_datagram_t)) {
+        ND_TCHECK(sflow_datagram->version);
+        ND_PRINT((ndo, "sFlowv%u", EXTRACT_32BITS(sflow_datagram->version)));
+        ND_PRINT((ndo, " [length %u < %zu]",
+                  len, sizeof(struct sflow_datagram_t)));
+        ND_PRINT((ndo, " (invalid)"));
+        return;
+    }

     ND_TCHECK(*sflow_datagram);
 
     /*
     ND_TCHECK(*sflow_datagram);
 
     /*


@@ -865,6 +924,8 @@ sflow_print(netdissect_options *ndo,
 
     /* skip Common header */
     tptr += sizeof(const struct sflow_datagram_t);
 
     /* skip Common header */
     tptr += sizeof(const struct sflow_datagram_t);

+
+    if(tlen <= sizeof(const struct sflow_datagram_t)) goto trunc;

     tlen -= sizeof(const struct sflow_datagram_t);
 
     while (nsamples > 0 && tlen > 0) {
     tlen -= sizeof(const struct sflow_datagram_t);
 
     while (nsamples > 0 && tlen > 0) {