X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ac31fbf801b950a0f0b16509f3b1b039833983e4..794a259a335c367d852959cd88dd9d46d183a74b:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 2596cd6d..d20addbf 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -150,14 +150,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);
@@ -221,7 +222,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 +238,7 @@ recurse:
 			 */
 			length_type = GET_BE_U_2(p);
 
+			ND_ICHECK_U(caplen, <, 2);
 			length -= 2;
 			caplen -= 2;
 			p += 2;
@@ -402,6 +404,7 @@ recurse:
 				ND_DEFAULTPRINT(p, caplen);
 		}
 	}
+invalid:
 	return hdrlen;
 }
 
@@ -564,6 +567,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);