From: Neale Ranns <nranns@cisco.com>
Date: Wed, 29 Aug 2018 10:05:17 +0000 (-0700)
Subject: SR-mpls: do not pass empty label stack to fib
X-Git-Tag: v18.10-rc1~319
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=3b23e9d5af4f02836b689286824c9217fa2aa19a;hp=1e3417f72f5b7b6a5b056f75477d6d536196c34a;p=vpp.git

SR-mpls: do not pass empty label stack to fib

Change-Id: Ib1601d01a54296e72be3bbfa057fce965549b02b
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/src/vnet/srmpls/sr_mpls_policy.c b/src/vnet/srmpls/sr_mpls_policy.c
index 7d336c17594..5bb7fb2bff5 100755
--- a/src/vnet/srmpls/sr_mpls_policy.c
+++ b/src/vnet/srmpls/sr_mpls_policy.c
@@ -85,20 +85,21 @@ create_sl (mpls_sr_policy_t * sr_policy, mpls_label_t * sl, u32 weight)
       .frp_local_label = sl[0],
     };
 
-    vec_add (path.frp_label_stack, sl + 1, vec_len (sl) - 1);
+    if (vec_len (sl) - 1)
+      vec_add (path.frp_label_stack, sl + 1, vec_len (sl) - 1);
 
     fib_route_path_t *paths = NULL;
     vec_add1 (paths, path);
 
-		/* *INDENT-OFF* */
-		fib_prefix_t	pfx = {
-			.fp_len = 21,
-			.fp_proto = FIB_PROTOCOL_MPLS,
-			.fp_label = sr_policy->bsid,
-			.fp_eos = eos,
-			.fp_payload_proto = DPO_PROTO_MPLS,
-		};
-		/* *INDENT-ON* */
+    /* *INDENT-OFF* */
+    fib_prefix_t pfx = {
+        .fp_len = 21,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_label = sr_policy->bsid,
+        .fp_eos = eos,
+        .fp_payload_proto = DPO_PROTO_MPLS,
+    };
+    /* *INDENT-ON* */
 
     fib_table_entry_path_add2 (0,
 			       &pfx,