Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index d2a6d87d6ad270a3ba5f5dc9c2942ff350ccba95..0ffb9220709b6253b372d3ccb59b0284dbffa7f7 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -40,22 +40,22 @@
  * as given to interface code.
  */
 struct arc_header {
  * as given to interface code.
  */
 struct arc_header {

-       u_int8_t  arc_shost;
-       u_int8_t  arc_dhost;
-       u_int8_t  arc_type;
+       uint8_t  arc_shost;
+       uint8_t  arc_dhost;
+       uint8_t  arc_type;

        /*
         * only present for newstyle encoding with LL fragmentation.
         * Don't use sizeof(anything), use ARC_HDR{,NEW}LEN instead.
         */
        /*
         * only present for newstyle encoding with LL fragmentation.
         * Don't use sizeof(anything), use ARC_HDR{,NEW}LEN instead.
         */

-       u_int8_t  arc_flag;
-       u_int16_t arc_seqid;
+       uint8_t  arc_flag;
+       uint16_t arc_seqid;

 
        /*
         * only present in exception packets (arc_flag == 0xff)
         */
 
        /*
         * only present in exception packets (arc_flag == 0xff)
         */

-       u_int8_t  arc_type2;    /* same as arc_type */
-       u_int8_t  arc_flag2;    /* real flag value */
-       u_int16_t arc_seqid2;   /* real seqid value */
+       uint8_t  arc_type2;     /* same as arc_type */
+       uint8_t  arc_flag2;     /* real flag value */
+       uint16_t arc_seqid2;    /* real seqid value */

 };
 
 #define        ARC_HDRLEN              3
 };
 
 #define        ARC_HDRLEN              3


@@ -84,17 +84,17 @@ struct      arc_header {
  * never presents packets that look like exception frames.
  */
 struct arc_linux_header {
  * never presents packets that look like exception frames.
  */
 struct arc_linux_header {

-       u_int8_t  arc_shost;
-       u_int8_t  arc_dhost;
-       u_int16_t arc_offset;
-       u_int8_t  arc_type;
+       uint8_t  arc_shost;
+       uint8_t  arc_dhost;
+       uint16_t arc_offset;
+       uint8_t  arc_type;

        /*
         * only present for newstyle encoding with LL fragmentation.
         * Don't use sizeof(anything), use ARC_LINUX_HDR{,NEW}LEN
         * instead.
         */
        /*
         * only present for newstyle encoding with LL fragmentation.
         * Don't use sizeof(anything), use ARC_LINUX_HDR{,NEW}LEN
         * instead.
         */

-       u_int8_t  arc_flag;
-       u_int16_t arc_seqid;
+       uint8_t  arc_flag;
+       uint16_t arc_seqid;

 };
 
 #define        ARC_LINUX_HDRLEN        5
 };
 
 #define        ARC_LINUX_HDRLEN        5


@@ -181,7 +181,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 +202,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 +268,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 +279,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 +326,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: