DNS: Sync types with IANA

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 15b30630fb2418330246f3c6770439b540cce168..2f1183c00699b577dc4d5723cc558899b74c085e 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -231,11 +231,12 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        u_int total_advance;
        const u_char *cp;
        uint32_t payload_len;
-       uint8_t nh;
+       uint8_t ph, nh;
        int fragmented = 0;
        u_int flow;
        int found_extension_header;
        int found_jumbo;
+       int found_hbh;
 
        ndo->ndo_protocol = "ip6";
        ip6 = (const struct ip6_hdr *)bp;
@@ -285,6 +286,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        } else
                len = length + sizeof(struct ip6_hdr);
 
+       ph = 255;
        nh = GET_U_1(ip6->ip6_nxt);
        if (ndo->ndo_vflag) {
            flow = GET_BE_U_4(ip6->ip6_flow);
@@ -305,7 +307,10 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        /*
         * Cut off the snapshot length to the end of the IP payload.
         */
-       nd_push_snaplen(ndo, bp, len);
+       if (!nd_push_snaplen(ndo, bp, len)) {
+               (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+                       "%s: can't push snaplen on buffer stack", __func__);
+       }
 
        cp = (const u_char *)ip6;
        advance = sizeof(struct ip6_hdr);
@@ -313,6 +318,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        /* Process extension headers */
        found_extension_header = 0;
        found_jumbo = 0;
+       found_hbh = 0;
        while (cp < ndo->ndo_snapend && advance > 0) {
                if (len < (u_int)advance)
                        goto trunc;
@@ -330,12 +336,32 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                switch (nh) {
 
                case IPPROTO_HOPOPTS:
+                       /*
+                        * The Hop-by-Hop Options header, when present,
+                        * must immediately follow the IPv6 header (RFC 8200)
+                        */
+                       if (found_hbh == 1) {
+                               ND_PRINT("[The Hop-by-Hop Options header was already found]");
+                               nd_print_invalid(ndo);
+                               return;
+                       }
+                       if (ph != 255) {
+                               ND_PRINT("[The Hop-by-Hop Options header don't follow the IPv6 header]");
+                               nd_print_invalid(ndo);
+                               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;
                        }
                        found_extension_header = 1;
+                       found_hbh = 1;
                        nh = GET_U_1(cp);
                        break;
 
@@ -438,7 +464,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                                                goto trunc;
 
                                        /*
-                                        * OK, we didn't see any extnesion
+                                        * OK, we didn't see any extension
                                         * header, but that means we have
                                         * no payload, so set the length
                                         * to the IPv6 header length,
@@ -463,6 +489,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        nd_pop_packet_info(ndo);
                        return;
                }
+               ph = nh;
 
                /* ndo_protocol reassignment after xxx_print() calls */
                ndo->ndo_protocol = "ip6";