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

diff --git a/print-ether.c b/print-ether.c
index e6753946..324d089f 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -21,12 +21,11 @@
 
 /* \summary: Ethernet printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
@@ -36,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;
 };
 
@@ -85,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" },
@@ -111,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
@@ -133,13 +132,13 @@ ether_type_print(netdissect_options *ndo, uint16_t type)
  * switch chips, and extra encapsulation header information before
  * printing Ethernet header information (such as a LANE ID for ATM LANE).
  */
-static void
+static u_int
 ether_common_print(netdissect_options *ndo, const u_char *p, u_int length,
     u_int caplen,
     void (*print_switch_tag)(netdissect_options *ndo, const u_char *),
     u_int switch_tag_len,
     void (*print_encap_header)(netdissect_options *ndo, const u_char *),
-    const u_char *encap_header_arg, u_int do_incr_ll_hdr_len)
+    const u_char *encap_header_arg)
 {
 	const struct ether_header *ehp;
 	u_int orig_length;
@@ -149,17 +148,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);
-		if (do_incr_ll_hdr_len)
-			ndo->ndo_ll_hdr_len += caplen;
-		return;
+	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);
-		if (do_incr_ll_hdr_len)
-			ndo->ndo_ll_hdr_len += length;
-		return;
+		return caplen;
 	}
 
 	if (print_encap_header != NULL)
@@ -173,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);
@@ -224,26 +220,23 @@ 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. */
 			if (!ndo->ndo_suppress_default_print)
 				ND_DEFAULTPRINT(p, caplen);
-			if (do_incr_ll_hdr_len)
-				ndo->ndo_ll_hdr_len += hdrlen;
-			return;
+			return hdrlen;
 		} else if (ret > 0) {
 			/* Problem printing the header; just quit. */
-			if (do_incr_ll_hdr_len)
-				ndo->ndo_ll_hdr_len += ret;
-			return;
+			return ret;
 		} else {
 			/*
 			 * Keep processing type/length fields.
 			 */
 			length_type = GET_BE_U_2(p);
 
+			ND_ICHECK_U(caplen, <, 2);
 			length -= 2;
 			caplen -= 2;
 			p += 2;
@@ -266,16 +259,12 @@ recurse:
 		if (caplen < 4) {
 			ndo->ndo_protocol = "vlan";
 			nd_print_trunc(ndo);
-			if (do_incr_ll_hdr_len)
-				ndo->ndo_ll_hdr_len += hdrlen + caplen;
-			return;
+			return hdrlen + caplen;
 		}
 		if (length < 4) {
 			ndo->ndo_protocol = "vlan";
 			nd_print_trunc(ndo);
-			if (do_incr_ll_hdr_len)
-				ndo->ndo_ll_hdr_len += hdrlen + length;
-			return;
+			return hdrlen + length;
 		}
 		if (ndo->ndo_eflag) {
 			uint16_t tag = GET_BE_U_2(p);
@@ -315,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");
@@ -358,15 +350,11 @@ recurse:
 	} else if (length_type == ETHERTYPE_ARISTA) {
 		if (caplen < 2) {
 			ND_PRINT("[|arista]");
-			if (do_incr_ll_hdr_len)
-				ndo->ndo_ll_hdr_len += hdrlen + caplen;
-			return;
+			return hdrlen + caplen;
 		}
 		if (length < 2) {
 			ND_PRINT("[|arista]");
-			if (do_incr_ll_hdr_len)
-				ndo->ndo_ll_hdr_len += hdrlen + length;
-			return;
+			return hdrlen + length;
 		}
 		ether_type_print(ndo, length_type);
 		ND_PRINT(", length %u: ", orig_length);
@@ -417,13 +405,12 @@ recurse:
 				ND_DEFAULTPRINT(p, caplen);
 		}
 	}
-	if (do_incr_ll_hdr_len)
-		ndo->ndo_ll_hdr_len += hdrlen;
-	return;
+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
@@ -431,14 +418,14 @@ recurse:
  *
  * FIXME: caplen can and should be derived from ndo->ndo_snapend and p.
  */
-void
+u_int
 ether_switch_tag_print(netdissect_options *ndo, const u_char *p, u_int length,
     u_int caplen,
     void (*print_switch_tag)(netdissect_options *, const u_char *),
-    u_int switch_tag_len, u_int do_incr_ll_hdr_len)
+    u_int switch_tag_len)
 {
-	ether_common_print(ndo, p, length, caplen, print_switch_tag,
-			   switch_tag_len, NULL, NULL, do_incr_ll_hdr_len);
+	return ether_common_print(ndo, p, length, caplen, print_switch_tag,
+				  switch_tag_len, NULL, NULL);
 }
 
 /*
@@ -449,15 +436,15 @@ ether_switch_tag_print(netdissect_options *ndo, const u_char *p, u_int length,
  *
  * FIXME: caplen can and should be derived from ndo->ndo_snapend and p.
  */
-void
+u_int
 ether_print(netdissect_options *ndo,
 	    const u_char *p, u_int length, u_int caplen,
 	    void (*print_encap_header)(netdissect_options *ndo, const u_char *),
-	    const u_char *encap_header_arg, u_int do_incr_ll_hdr_len)
+	    const u_char *encap_header_arg)
 {
 	ndo->ndo_protocol = "ether";
-	ether_common_print(ndo, p, length, caplen, NULL, 0,
-			   print_encap_header, encap_header_arg, do_incr_ll_hdr_len);
+	return ether_common_print(ndo, p, length, caplen, NULL, 0,
+				  print_encap_header, encap_header_arg);
 }
 
 /*
@@ -471,9 +458,8 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	       const u_char *p)
 {
 	ndo->ndo_protocol = "ether";
-	ndo->ndo_ll_hdr_len += 0;
-
-	ether_print(ndo, p, h->len, h->caplen, NULL, NULL, TRUE);
+	ndo->ndo_ll_hdr_len +=
+		ether_print(ndo, p, h->len, h->caplen, NULL, NULL);
 }
 
 /*
@@ -493,15 +479,12 @@ 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";
-	if (h->caplen < 4) {
-		ndo->ndo_ll_hdr_len += h->caplen;
-		nd_print_trunc(ndo);
-		return;
-	}
-	ndo->ndo_ll_hdr_len += 4;
+	ND_TCHECK_4(p);
 
 	/* Skip the pseudo-header. */
-	ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL, TRUE);
+	ndo->ndo_ll_hdr_len += 4;
+	ndo->ndo_ll_hdr_len +=
+		ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL);
 }
 
 /*
@@ -524,15 +507,12 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
 	 * preamble, and SOF.
 	 */
 	ndo->ndo_protocol = "netanalyzer_transparent";
-	if (h->caplen < 12) {
-		ndo->ndo_ll_hdr_len += h->caplen;
-		nd_print_trunc(ndo);
-		return;
-	}
-	ndo->ndo_ll_hdr_len += 12;
+	ND_TCHECK_LEN(p, 12);
 
 	/* Skip the pseudo-header, preamble, and SOF. */
-	ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL, TRUE);
+	ndo->ndo_ll_hdr_len += 12;
+	ndo->ndo_ll_hdr_len +=
+		ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL);
 }
 
 /*
@@ -588,6 +568,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_1(p);
 		isoclns_print(ndo, p + 1, length - 1);
 		return(1);
 
@@ -602,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: