CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 2784401c9a2c2b99b08b94a6809afad49904be7b..269b41fb2a7aabc87b2cf811126734728a49b027 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -21,9 +21,7 @@
 
 /* \summary: IPv6 printer */
 
 
 /* \summary: IPv6 printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -241,19 +239,13 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        ndo->ndo_protocol = "ip6";
        ip6 = (const struct ip6_hdr *)bp;
 
        ndo->ndo_protocol = "ip6";
        ip6 = (const struct ip6_hdr *)bp;
 

-       ND_TCHECK_SIZE(ip6);
-       if (length < sizeof (struct ip6_hdr)) {
-               ND_PRINT("truncated-ip6 %u", length);
-               return;
+       if (!ndo->ndo_eflag) {
+               nd_print_protocol_caps(ndo);
+               ND_PRINT(" ");

        }
 
        }
 

-       if (!ndo->ndo_eflag)
-           ND_PRINT("IP6 ");
-
-       if (IP6_VERSION(ip6) != 6) {
-         ND_PRINT("version error: %u != 6", IP6_VERSION(ip6));
-         return;
-       }
+       ND_ICHECK_ZU(length, <, sizeof (struct ip6_hdr));
+       ND_ICHECKMSG_U("version", IP6_VERSION(ip6), !=, 6);

 
        payload_len = GET_BE_U_2(ip6->ip6_plen);
        /*
 
        payload_len = GET_BE_U_2(ip6->ip6_plen);
        /*


@@ -280,9 +272,12 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
         */
        if (payload_len != 0) {
                len = payload_len + sizeof(struct ip6_hdr);
         */
        if (payload_len != 0) {
                len = payload_len + sizeof(struct ip6_hdr);

-               if (length < len)
-                       ND_PRINT("truncated-ip6 - %u bytes missing!",
-                               len - length);
+               if (len > length) {
+                       ND_PRINT("[header+payload length %u > length %u]",
+                                len, length);
+                       nd_print_invalid(ndo);
+                       ND_PRINT(" ");
+               }

        } else
                len = length + sizeof(struct ip6_hdr);
 
        } else
                len = length + sizeof(struct ip6_hdr);
 


@@ -297,17 +292,20 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
            if (flow & 0x000fffff)
                ND_PRINT("flowlabel 0x%05x, ", flow & 0x000fffff);
 
            if (flow & 0x000fffff)
                ND_PRINT("flowlabel 0x%05x, ", flow & 0x000fffff);
 

-           ND_PRINT("hlim %u, next-header %s (%u) payload length: %u) ",
+           ND_PRINT("hlim %u, next-header %s (%u), payload length %u) ",

                         GET_U_1(ip6->ip6_hlim),
                         tok2str(ipproto_values,"unknown",nh),
                         nh,
                         payload_len);
        }
                         GET_U_1(ip6->ip6_hlim),
                         tok2str(ipproto_values,"unknown",nh),
                         nh,
                         payload_len);
        }

+       ND_TCHECK_SIZE(ip6);

 
        /*
 
        /*

-        * Cut off the snapshot length to the end of the IP payload.
+        * Cut off the snapshot length to the end of the IP payload
+        * or the end of the data in which it's contained, whichever
+        * comes first.

         */
         */

-       if (!nd_push_snaplen(ndo, bp, len)) {
+       if (!nd_push_snaplen(ndo, bp, ND_MIN(length, len))) {

                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
                        "%s: can't push snaplen on buffer stack", __func__);
        }
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
                        "%s: can't push snaplen on buffer stack", __func__);
        }


@@ -330,7 +328,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                    nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
                    nh != IPPROTO_DCCP && nh != IPPROTO_SCTP) {
                        ND_PRINT("%s > %s: ", GET_IP6ADDR_STRING(ip6->ip6_src),
                    nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
                    nh != IPPROTO_DCCP && nh != IPPROTO_SCTP) {
                        ND_PRINT("%s > %s: ", GET_IP6ADDR_STRING(ip6->ip6_src),

-                                    GET_IP6ADDR_STRING(ip6->ip6_dst));
+                                GET_IP6ADDR_STRING(ip6->ip6_dst));

                }
 
                switch (nh) {
                }
 
                switch (nh) {


@@ -351,6 +349,11 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                                return;
                        }
                        advance = hbhopt_process(ndo, cp, &found_jumbo, &payload_len);
                                return;
                        }
                        advance = hbhopt_process(ndo, cp, &found_jumbo, &payload_len);

+                       if (payload_len == 0 && found_jumbo == 0) {
+                               ND_PRINT("[No valid Jumbo Payload Hop-by-Hop option found]");
+                               nd_print_invalid(ndo);
+                               return;
+                       }

                        if (advance < 0) {
                                nd_pop_packet_info(ndo);
                                return;
                        if (advance < 0) {
                                nd_pop_packet_info(ndo);
                                return;


@@ -384,7 +387,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                case IPPROTO_MOBILITY_OLD:
                case IPPROTO_MOBILITY:
                        /*
                case IPPROTO_MOBILITY_OLD:
                case IPPROTO_MOBILITY:
                        /*

-                        * XXX - we don't use "advance"; RFC 3775 says that
+                        * RFC 3775 says that

                         * the next header field in a mobility header
                         * should be IPPROTO_NONE, but speaks of
                         * the possibility of a future extension in
                         * the next header field in a mobility header
                         * should be IPPROTO_NONE, but speaks of
                         * the possibility of a future extension in


@@ -431,9 +434,12 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                                len = payload_len + sizeof(struct ip6_hdr);
                                if (len < total_advance)
                                        goto trunc;
                                len = payload_len + sizeof(struct ip6_hdr);
                                if (len < total_advance)
                                        goto trunc;

-                               if (length < len)
-                                       ND_PRINT("truncated-ip6 - %u bytes missing!",
-                                               len - length);
+                               if (len > length) {
+                                       ND_PRINT("[header+payload length %u > length %u]",
+                                                len, length);
+                                       nd_print_invalid(ndo);
+                                       ND_PRINT(" ");
+                               }

                                nd_change_snaplen(ndo, bp, len);
 
                                /*
                                nd_change_snaplen(ndo, bp, len);
 
                                /*


@@ -494,4 +500,8 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        return;
 trunc:
        nd_print_trunc(ndo);
        return;
 trunc:
        nd_print_trunc(ndo);

+       return;
+
+invalid:
+       nd_print_invalid(ndo);

 }
 }