X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b73d5ba2125bb5f0a6c42afd7542acab0cab320f..HEAD:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 3aeda8f7..324d089f 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -21,9 +21,7 @@
 
 /* \summary: Ethernet printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -37,8 +35,8 @@
  * Structure of an Ethernet header.
  */
 struct	ether_header {
-	nd_mac_addr	ether_dhost;
-	nd_mac_addr	ether_shost;
+	nd_mac48	ether_dhost;
+	nd_mac48	ether_shost;
 	nd_uint16_t	ether_length_type;
 };
 
@@ -86,7 +84,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" },
@@ -112,7 +110,7 @@ ether_addresses_print(netdissect_options *ndo, const u_char *src,
 		      const u_char *dst)
 {
 	ND_PRINT("%s > %s, ",
-		 GET_ETHERADDR_STRING(src), GET_ETHERADDR_STRING(dst));
+		 GET_MAC48_STRING(src), GET_MAC48_STRING(dst));
 }
 
 static void
@@ -150,14 +148,15 @@ ether_common_print(netdissect_options *ndo, const u_char *p, u_int length,
 	int llc_hdrlen;
 	struct lladdr_info src, dst;
 
+	if (length < caplen) {
+		ND_PRINT("[length %u < caplen %u]", length, caplen);
+		nd_print_invalid(ndo);
+		return length;
+	}
 	if (caplen < ETHER_HDRLEN + switch_tag_len) {
 		nd_print_trunc(ndo);
 		return caplen;
 	}
-	if (length < ETHER_HDRLEN + switch_tag_len) {
-		nd_print_trunc(ndo);
-		return length;
-	}
 
 	if (print_encap_header != NULL)
 		(*print_encap_header)(ndo, encap_header_arg);
@@ -170,14 +169,14 @@ ether_common_print(netdissect_options *ndo, const u_char *p, u_int length,
 	 */
 	ehp = (const struct ether_header *)p;
 	src.addr = ehp->ether_shost;
-	src.addr_string = etheraddr_string;
+	src.addr_string = mac48_string;
 	dst.addr = ehp->ether_dhost;
-	dst.addr_string = etheraddr_string;
+	dst.addr_string = mac48_string;
 
-	length -= 2*MAC_ADDR_LEN;
-	caplen -= 2*MAC_ADDR_LEN;
-	p += 2*MAC_ADDR_LEN;
-	hdrlen = 2*MAC_ADDR_LEN;
+	length -= 2*MAC48_LEN;
+	caplen -= 2*MAC48_LEN;
+	p += 2*MAC48_LEN;
+	hdrlen = 2*MAC48_LEN;
 
 	if (ndo->ndo_eflag)
 		ether_addresses_print(ndo, src.addr, dst.addr);
@@ -221,7 +220,7 @@ recurse:
 		}
 
 		int ret = macsec_print(ndo, &p, &length, &caplen, &hdrlen,
-		    &src, &dst);
+				       &src, &dst);
 
 		if (ret == 0) {
 			/* Payload is encrypted; print it as raw data. */
@@ -237,6 +236,7 @@ recurse:
 			 */
 			length_type = GET_BE_U_2(p);
 
+			ND_ICHECK_U(caplen, <, 2);
 			length -= 2;
 			caplen -= 2;
 			p += 2;
@@ -304,7 +304,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");
@@ -402,11 +405,12 @@ recurse:
 				ND_DEFAULTPRINT(p, caplen);
 		}
 	}
+invalid:
 	return hdrlen;
 }
 
 /*
- * Print an Ethernet frame while specyfing a non-standard Ethernet header
+ * Print an Ethernet frame while specifying a non-standard Ethernet header
  * length.
  * This might be encapsulated within another frame; we might be passed
  * a pointer to a function that can print header information for that
@@ -475,7 +479,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	 * Fail if we don't have enough data for the Hilscher pseudo-header.
 	 */
 	ndo->ndo_protocol = "netanalyzer";
-	ND_TCHECK_LEN(p, 4);
+	ND_TCHECK_4(p);
 
 	/* Skip the pseudo-header. */
 	ndo->ndo_ll_hdr_len += 4;
@@ -581,8 +585,8 @@ ethertype_print(netdissect_options *ndo,
 		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: