SMB: Add two missing bounds checks

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index d744b9e340364bdf544ed7c6e835d1e36e6638d2..bdc66c642360bc7710da437abd20a04f744509cc 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -29,10 +29,10 @@
 /* \summary: Multi-Protocol Label Switching (MPLS) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -64,15 +64,14 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
        uint16_t label_stack_depth = 0;
        enum mpls_packet_type pt = PT_UNKNOWN;
 
+       ndo->ndo_protocol = "mpls";
        p = bp;
        ND_PRINT("MPLS");
        do {
                ND_TCHECK_LEN(p, sizeof(label_entry));
-               if (length < sizeof(label_entry)) {
-                       ND_PRINT("[|MPLS], length %u", length);
-                       return;
-               }
-               label_entry = EXTRACT_BE_U_4(p);
+               if (length < sizeof(label_entry))
+                       goto trunc;
+               label_entry = GET_BE_U_4(p);
                ND_PRINT("%s(label %u",
                       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",
                               MPLS_LABEL(label_entry));
@@ -134,7 +133,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        /* nothing to print */
                        return;
                }
-               switch(EXTRACT_U_1(p)) {
+               switch(GET_U_1(p)) {
 
                case 0x45:
                case 0x46:
@@ -210,13 +209,5 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
        return;
 
 trunc:
-       ND_PRINT("[|MPLS]");
+       nd_print_trunc(ndo);
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */