X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/cfa9ab5f80dd9a1024e1a765bc0d24c57652b6bc..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-l2tp.c

diff --git a/print-l2tp.c b/print-l2tp.c
index 184ff752..a5cc378b 100644
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -88,7 +88,7 @@
 #define	L2TP_MSGTYPE_SLI	16 /* Set-Link-Info */
 
 static const struct tok l2tp_msgtype2str[] = {
-	{ L2TP_MSGTYPE_SCCRQ, 	"SCCRQ" },
+	{ L2TP_MSGTYPE_SCCRQ,	"SCCRQ" },
 	{ L2TP_MSGTYPE_SCCRP,	"SCCRP" },
 	{ L2TP_MSGTYPE_SCCCN,	"SCCCN" },
 	{ L2TP_MSGTYPE_STOPCCN,	"StopCCN" },
@@ -114,17 +114,17 @@ static const struct tok l2tp_msgtype2str[] = {
 #define L2TP_AVP_FIRM_VER		6  /* Firmware Revision */
 #define L2TP_AVP_HOST_NAME		7  /* Host Name */
 #define L2TP_AVP_VENDOR_NAME		8  /* Vendor Name */
-#define L2TP_AVP_ASSND_TUN_ID 		9  /* Assigned Tunnel ID */
+#define L2TP_AVP_ASSND_TUN_ID		9  /* Assigned Tunnel ID */
 #define L2TP_AVP_RECV_WIN_SIZE		10 /* Receive Window Size */
 #define L2TP_AVP_CHALLENGE		11 /* Challenge */
 #define L2TP_AVP_Q931_CC		12 /* Q.931 Cause Code */
 #define L2TP_AVP_CHALLENGE_RESP		13 /* Challenge Response */
-#define L2TP_AVP_ASSND_SESS_ID  	14 /* Assigned Session ID */
-#define L2TP_AVP_CALL_SER_NUM 		15 /* Call Serial Number */
+#define L2TP_AVP_ASSND_SESS_ID		14 /* Assigned Session ID */
+#define L2TP_AVP_CALL_SER_NUM		15 /* Call Serial Number */
 #define L2TP_AVP_MINIMUM_BPS		16 /* Minimum BPS */
 #define L2TP_AVP_MAXIMUM_BPS		17 /* Maximum BPS */
 #define L2TP_AVP_BEARER_TYPE		18 /* Bearer Type */
-#define L2TP_AVP_FRAMING_TYPE 		19 /* Framing Type */
+#define L2TP_AVP_FRAMING_TYPE		19 /* Framing Type */
 #define L2TP_AVP_PACKET_PROC_DELAY	20 /* Packet Processing Delay (OBSOLETE) */
 #define L2TP_AVP_CALLED_NUMBER		21 /* Called Number */
 #define L2TP_AVP_CALLING_NUMBER		22 /* Calling Number */
@@ -144,7 +144,7 @@ static const struct tok l2tp_msgtype2str[] = {
 #define L2TP_AVP_RANDOM_VECTOR		36 /* Random Vector */
 #define L2TP_AVP_PRIVATE_GRP_ID		37 /* Private Group ID */
 #define L2TP_AVP_RX_CONN_SPEED		38 /* (Rx) Connect Speed */
-#define L2TP_AVP_SEQ_REQUIRED 		39 /* Sequencing Required */
+#define L2TP_AVP_SEQ_REQUIRED		39 /* Sequencing Required */
 #define L2TP_AVP_PPP_DISCON_CC		46 /* PPP Disconnect Cause Code - RFC 3145 */
 
 static const struct tok l2tp_avp2str[] = {
@@ -577,7 +577,7 @@ l2tp_avp_print(netdissect_options *ndo, const u_char *dat, u_int length)
 	len = GET_BE_U_2(dat) & L2TP_AVP_HDR_LEN_MASK;
 
 	/* If it is not long enough to contain the header, we'll give up. */
-	ND_LCHECKMSG_U(len, 6, "AVP length");
+	ND_ICHECKMSG_U("AVP length", len, <, 6);
 
 	/* If it goes past the end of the remaining length of the packet,
 	   we'll give up. */
@@ -807,6 +807,8 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length)
 
 	if (flag_o) {	/* Offset Size */
 		pad =  GET_BE_U_2(ptr);
+		/* Offset padding octets in packet buffer? */
+		ND_TCHECK_LEN(ptr + 2, pad);
 		ptr += (2 + pad);
 		cnt += (2 + pad);
 	}