Don't default to ethernet, ethernet should be preceded by a pseudowire.

If the payload type can't be determined, raise an alert.

diff --git a/rules/decoder-events.rules b/rules/decoder-events.rules
index 6fbcdb74af866aa38844313350b9dd10436ef66c..a62849f1032499789af9a8a77ee63b0709827026 100644 (file)
--- a/rules/decoder-events.rules
+++ b/rules/decoder-events.rules
@@ -120,6 +120,7 @@ alert pkthdr any any -> any any (msg:"SURICATA IPv6-in-IPv6 invalid protocol"; d
 alert pkthdr any any -> any any (msg:"SURICATA MPLS bad router alert label"; mpls.bad_label_router_alert; sid: 2200098; rev:1;)
 alert pkthdr any any -> any any (msg:"SURICATA MPLS bad implicit null label"; mpls.bad_label_implicit_null; sid: 2200099; rev:1;)
 alert pkthdr any any -> any any (msg:"SURICATA MPLS reserved label"; mpls.bad_label_reserved; sid: 2200100; rev:1;)
+alert pkthdr any any -> any any (msg:"SURICATA MPLS unknown payload type"; mpls.unknown_payload_type; sid: 2200101; rev:1;)
 
-# next sid is 2200101
+# next sid is 2200102
 

diff --git a/src/decode-events.h b/src/decode-events.h
index d9a1d5a680e1dc83815c0045012ed962ff52dcdd..d794bf5fa92eeab61ae83605d6f17492bcc821a3 100644 (file)
--- a/src/decode-events.h
+++ b/src/decode-events.h
@@ -232,6 +232,7 @@ enum {
     MPLS_BAD_LABEL_ROUTER_ALERT,
     MPLS_BAD_LABEL_IMPLICIT_NULL,
     MPLS_BAD_LABEL_RESERVED,
+    MPLS_UNKNOWN_PAYLOAD_TYPE,
 
     /* should always be last! */
     DECODE_EVENT_MAX,

diff --git a/src/decode-mpls.c b/src/decode-mpls.c
index 7ffc5d1d878fea093669183e0b0c6be478df7507..0b125a11e9b9864087ecd4f17aeea269dfdd34b0 100644 (file)
--- a/src/decode-mpls.c
+++ b/src/decode-mpls.c
@@ -40,7 +40,7 @@
 #define MPLS_BOTTOM(shim)       ((ntohl(shim) >> 8) & 0x1)
 
 /* Inner protocol guessing values. */
-#define MPLS_PROTO_ETHERNET     0
+#define MPLS_PROTO_ETHERNET_PW  0
 #define MPLS_PROTO_IPV4         4
 #define MPLS_PROTO_IPV6         6
 
@@ -82,8 +82,7 @@ int DecodeMPLS(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint8_t *pkt,
     }
 
     if (event) {
-        ENGINE_SET_EVENT(p, event);
-        return TM_ECODE_OK;
+        goto end;
     }
 
     /* Best guess at inner packet. */
@@ -94,17 +93,19 @@ int DecodeMPLS(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint8_t *pkt,
     case MPLS_PROTO_IPV6:
         DecodeIPV6(tv, dtv, p, pkt, len, pq);
         break;
-    case MPLS_PROTO_ETHERNET:
-        /* Looks like it could be an ethernet pseudowire. */
+    case MPLS_PROTO_ETHERNET_PW:
         DecodeEthernet(tv, dtv, p, pkt + MPLS_PW_LEN, len - MPLS_PW_LEN,
             pq);
         break;
     default:
-        /* Attempt ethernet without PW. */
-        DecodeEthernet(tv, dtv, p, pkt, len, pq);
+        event = MPLS_UNKNOWN_PAYLOAD_TYPE;
         break;
     }
 
+end:
+    if (event) {
+        ENGINE_SET_EVENT(p, event);
+    }
     return TM_ECODE_OK;
 }
 
@@ -230,6 +231,50 @@ static int DecodeMPLSTestBadLabelReserved(void)
     return ret;
 }
 
+static int DecodeMPLSTestUnknownPayloadType(void)
+{
+    int ret = 1;
+
+    /* Valid label: 21.
+     * Unknown payload type: 1.
+     */
+    uint8_t pkt[] = {
+        0x00, 0x01, 0x51, 0xff, 0x15, 0x00, 0x00, 0x64,
+        0x00, 0x0a, 0x00, 0x00, 0xff, 0x01, 0xa5, 0x6a,
+        0x0a, 0x01, 0x02, 0x01, 0x0a, 0x22, 0x00, 0x01,
+        0x08, 0x00, 0x3a, 0x77, 0x0a, 0x39, 0x06, 0x2b,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x33, 0x50,
+        0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd,
+        0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd,
+        0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd,
+        0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd,
+        0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd,
+        0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd,
+        0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd,
+        0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd, 0xab, 0xcd
+    };
+
+    Packet *p = SCMalloc(SIZE_OF_PACKET);
+    if (unlikely(p == NULL)) {
+        return 0;
+    }
+    ThreadVars tv;
+    DecodeThreadVars dtv;
+
+    memset(&dtv, 0, sizeof(DecodeThreadVars));
+    memset(&tv,  0, sizeof(ThreadVars));
+    memset(p, 0, SIZE_OF_PACKET);
+
+    DecodeMPLS(&tv, &dtv, p, pkt, sizeof(pkt), NULL);
+
+    if (!ENGINE_ISSET_EVENT(p, MPLS_UNKNOWN_PAYLOAD_TYPE)) {
+        ret = 0;
+    }
+
+    SCFree(p);
+    return ret;
+}
+
 #endif /* UNITTESTS */
 
 void DecodeMPLSRegisterTests(void)
@@ -241,5 +286,7 @@ void DecodeMPLSRegisterTests(void)
         DecodeMPLSTestBadLabelImplicitNull, 1);
     UtRegisterTest("DecodeMPLSTestBadLabelReserved",
         DecodeMPLSTestBadLabelReserved, 1);
+    UtRegisterTest("DecodeMPLSTestUnknownPayloadType",
+        DecodeMPLSTestUnknownPayloadType, 1);
 #endif /* UNITTESTS */
 }

diff --git a/src/detect-engine-event.h b/src/detect-engine-event.h
index 2fecc8769b49d9b819b281032ef82087790614fa..1057399cc1e2600a30919b02db98b2aa21832871 100644 (file)
--- a/src/detect-engine-event.h
+++ b/src/detect-engine-event.h
@@ -236,6 +236,7 @@ struct DetectEngineEvents_ {
     { "mpls.bad_label_router_alert", MPLS_BAD_LABEL_ROUTER_ALERT, },
     { "mpls.bad_label_implicit_null", MPLS_BAD_LABEL_IMPLICIT_NULL, },
     { "mpls.bad_label_reserved", MPLS_BAD_LABEL_RESERVED, },
+    { "mpls.unknown_payload_type", MPLS_UNKNOWN_PAYLOAD_TYPE, },
 
     { NULL, 0 },
 };