CVE-2017-13029/PPP: Fix a bounds check, and clean up other bounds checks.

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 241c5070c9596896f9c02d835e5ad383089fb293..33a135e0c373fe8407e1f1511dd9baf2145aae50 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -72,6 +72,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_RRCP,           "RRCP" },
     { ETHERTYPE_MS_NLB_HB,      "MS NLB heartbeat" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
+    { ETHERTYPE_NSH,            "NSH" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
     { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
@@ -366,7 +367,7 @@ ethertype_print(netdissect_options *ndo,
                        ND_PRINT((ndo, " [|osi]"));
                        return (1);
                }
-               isoclns_print(ndo, p + 1, length - 1, caplen - 1);
+               isoclns_print(ndo, p + 1, length - 1);
                return(1);
 
        case ETHERTYPE_PPPOED:
@@ -408,6 +409,10 @@ ethertype_print(netdissect_options *ndo,
                lldp_print(ndo, p, length);
                return (1);
 
+        case ETHERTYPE_NSH:
+                nsh_print(ndo, p, length);
+                return (1);
+
         case ETHERTYPE_LOOPBACK:
                loopback_print(ndo, p, length);
                 return (1);
@@ -439,7 +444,7 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
        case ETHERTYPE_MEDSA:
-               medsa_print(ndo, p, length, caplen);
+               medsa_print(ndo, p, length, caplen, src, dst);
                return (1);
 
        case ETHERTYPE_LAT: