X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4aac37f04316b37b73b99bdcdbfa97347bb2fe51..0a7b2e9975677473b51c77b1cd41a93ff06efeba:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 299c2013..cd623f90 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -27,6 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
@@ -57,6 +58,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_8021Q9100,	"802.1Q-9100" },
     { ETHERTYPE_8021QinQ,	"802.1Q-QinQ" },
     { ETHERTYPE_8021Q9200,	"802.1Q-9200" },
+    { ETHERTYPE_MACSEC,		"802.1AE MACsec" },
     { ETHERTYPE_VMAN,		"VMAN" },
     { ETHERTYPE_PUP,            "PUP" },
     { ETHERTYPE_ARP,            "ARP"},
@@ -84,7 +86,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_PPPOED,         "PPPoE D" },
     { ETHERTYPE_PPPOES,         "PPPoE S" },
     { ETHERTYPE_EAPOL,          "EAPOL" },
-    { ETHERTYPE_RRCP,           "RRCP" },
+    { ETHERTYPE_REALTEK,        "Realtek protocols" },
     { ETHERTYPE_MS_NLB_HB,      "MS NLB heartbeat" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_NSH,            "NSH" },
@@ -148,13 +150,14 @@ ether_common_print(netdissect_options *ndo, const u_char *p, u_int length,
 	int llc_hdrlen;
 	struct lladdr_info src, dst;
 
-	if (caplen < ETHER_HDRLEN + switch_tag_len) {
-		nd_print_trunc(ndo);
-		return (caplen);
+	if (length < caplen) {
+		ND_PRINT("[length %u < caplen %u]", length, caplen);
+		nd_print_invalid(ndo);
+		return length;
 	}
-	if (length < ETHER_HDRLEN + switch_tag_len) {
+	if (caplen < ETHER_HDRLEN + switch_tag_len) {
 		nd_print_trunc(ndo);
-		return (length);
+		return caplen;
 	}
 
 	if (print_encap_header != NULL)
@@ -204,9 +207,48 @@ recurse:
 	hdrlen += 2;
 
 	/*
-	 * Process VLAN tag types.
+	 * Process 802.1AE MACsec headers.
 	 */
 	printed_length = 0;
+	if (length_type == ETHERTYPE_MACSEC) {
+		/*
+		 * MACsec, aka IEEE 802.1AE-2006
+		 * Print the header, and try to print the payload if it's not encrypted
+		 */
+		if (ndo->ndo_eflag) {
+			ether_type_print(ndo, length_type);
+			ND_PRINT(", length %u: ", orig_length);
+			printed_length = 1;
+		}
+
+		int ret = macsec_print(ndo, &p, &length, &caplen, &hdrlen,
+				       &src, &dst);
+
+		if (ret == 0) {
+			/* Payload is encrypted; print it as raw data. */
+			if (!ndo->ndo_suppress_default_print)
+				ND_DEFAULTPRINT(p, caplen);
+			return hdrlen;
+		} else if (ret > 0) {
+			/* Problem printing the header; just quit. */
+			return ret;
+		} else {
+			/*
+			 * Keep processing type/length fields.
+			 */
+			length_type = GET_BE_U_2(p);
+
+			ND_LCHECK_U(caplen, 2);
+			length -= 2;
+			caplen -= 2;
+			p += 2;
+			hdrlen += 2;
+		}
+	}
+
+	/*
+	 * Process VLAN tag types.
+	 */
 	while (length_type == ETHERTYPE_8021Q  ||
 		length_type == ETHERTYPE_8021Q9100 ||
 		length_type == ETHERTYPE_8021Q9200 ||
@@ -219,12 +261,12 @@ recurse:
 		if (caplen < 4) {
 			ndo->ndo_protocol = "vlan";
 			nd_print_trunc(ndo);
-			return (hdrlen + caplen);
+			return hdrlen + caplen;
 		}
 		if (length < 4) {
 			ndo->ndo_protocol = "vlan";
 			nd_print_trunc(ndo);
-			return (hdrlen + length);
+			return hdrlen + length;
 		}
 		if (ndo->ndo_eflag) {
 			uint16_t tag = GET_BE_U_2(p);
@@ -264,7 +306,10 @@ recurse:
 		 * Cut off the snapshot length to the end of the
 		 * payload.
 		 */
-		nd_push_snapend(ndo, p + length);
+		if (!nd_push_snaplen(ndo, p, length)) {
+			(*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+				"%s: can't push snaplen on buffer stack", __func__);
+		}
 
 		if (ndo->ndo_eflag) {
 			ND_PRINT("802.3");
@@ -307,11 +352,11 @@ recurse:
 	} else if (length_type == ETHERTYPE_ARISTA) {
 		if (caplen < 2) {
 			ND_PRINT("[|arista]");
-			return (hdrlen + caplen);
+			return hdrlen + caplen;
 		}
 		if (length < 2) {
 			ND_PRINT("[|arista]");
-			return (hdrlen + length);
+			return hdrlen + length;
 		}
 		ether_type_print(ndo, length_type);
 		ND_PRINT(", length %u: ", orig_length);
@@ -362,7 +407,8 @@ recurse:
 				ND_DEFAULTPRINT(p, caplen);
 		}
 	}
-	return (hdrlen);
+invalid:
+	return hdrlen;
 }
 
 /*
@@ -380,8 +426,8 @@ ether_switch_tag_print(netdissect_options *ndo, const u_char *p, u_int length,
     void (*print_switch_tag)(netdissect_options *, const u_char *),
     u_int switch_tag_len)
 {
-	return (ether_common_print(ndo, p, length, caplen, print_switch_tag,
-				   switch_tag_len, NULL, NULL));
+	return ether_common_print(ndo, p, length, caplen, print_switch_tag,
+				  switch_tag_len, NULL, NULL);
 }
 
 /*
@@ -399,8 +445,8 @@ ether_print(netdissect_options *ndo,
 	    const u_char *encap_header_arg)
 {
 	ndo->ndo_protocol = "ether";
-	return (ether_common_print(ndo, p, length, caplen, NULL, 0,
-				   print_encap_header, encap_header_arg));
+	return ether_common_print(ndo, p, length, caplen, NULL, 0,
+				  print_encap_header, encap_header_arg);
 }
 
 /*
@@ -409,12 +455,13 @@ ether_print(netdissect_options *ndo,
  * of the packet off the wire, and 'h->caplen' is the number
  * of bytes actually captured.
  */
-u_int
+void
 ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	       const u_char *p)
 {
-	ndo->ndo_protocol = "ether_if";
-	return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL));
+	ndo->ndo_protocol = "ether";
+	ndo->ndo_ll_hdr_len +=
+		ether_print(ndo, p, h->len, h->caplen, NULL, NULL);
 }
 
 /*
@@ -426,21 +473,20 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  * This is for DLT_NETANALYZER, which has a 4-byte pseudo-header
  * before the Ethernet header.
  */
-u_int
+void
 netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 		     const u_char *p)
 {
 	/*
 	 * Fail if we don't have enough data for the Hilscher pseudo-header.
 	 */
-	ndo->ndo_protocol = "netanalyzer_if";
-	if (h->caplen < 4) {
-		nd_print_trunc(ndo);
-		return (h->caplen);
-	}
+	ndo->ndo_protocol = "netanalyzer";
+	ND_TCHECK_LEN(p, 4);
 
 	/* Skip the pseudo-header. */
-	return (4 + ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL));
+	ndo->ndo_ll_hdr_len += 4;
+	ndo->ndo_ll_hdr_len +=
+		ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL);
 }
 
 /*
@@ -453,7 +499,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  * pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF
  * before the Ethernet header.
  */
-u_int
+void
 netanalyzer_transparent_if_print(netdissect_options *ndo,
 				 const struct pcap_pkthdr *h,
 				 const u_char *p)
@@ -462,14 +508,13 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
 	 * Fail if we don't have enough data for the Hilscher pseudo-header,
 	 * preamble, and SOF.
 	 */
-	ndo->ndo_protocol = "netanalyzer_transparent_if";
-	if (h->caplen < 12) {
-		nd_print_trunc(ndo);
-		return (h->caplen);
-	}
+	ndo->ndo_protocol = "netanalyzer_transparent";
+	ND_TCHECK_LEN(p, 12);
 
 	/* Skip the pseudo-header, preamble, and SOF. */
-	return (12 + ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL));
+	ndo->ndo_ll_hdr_len += 12;
+	ndo->ndo_ll_hdr_len +=
+		ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL);
 }
 
 /*
@@ -525,6 +570,9 @@ ethertype_print(netdissect_options *ndo,
 			nd_print_trunc(ndo);
 			return (1);
 		}
+		/* At least one byte is required */
+		/* FIXME: Reference for this byte? */
+		ND_TCHECK_LEN(p, 1);
 		isoclns_print(ndo, p + 1, length - 1);
 		return(1);
 
@@ -536,11 +584,11 @@ ethertype_print(netdissect_options *ndo,
 		return (1);
 
 	case ETHERTYPE_EAPOL:
-		eap_print(ndo, p, length);
+		eapol_print(ndo, p);
 		return (1);
 
-	case ETHERTYPE_RRCP:
-		rrcp_print(ndo, p, length, src, dst);
+	case ETHERTYPE_REALTEK:
+		rtl_print(ndo, p, length, src, dst);
 		return (1);
 
 	case ETHERTYPE_PPP: