commit bd6462e16a55a63561bfaaf75018aa378f201343
author Dave Barach <dave@barachs.net> Fri Dec 16 09:20:04 2016 -0500
committer Neale Ranns <nranns@cisco.com> Fri Dec 16 20:31:18 2016 +0000
tree b7acae918e636950957c9229003a556a6f610c15
parent d6900496dd3ecc807fb2936d3b1bb8f58a2ddf29

Coverity fixes, VPP-486

Change-Id: I8906bb983128e8f6e2664e367d2015325c1125fb
Signed-off-by: Dave Barach <dave@barachs.net>

vnet/vnet/mpls/mpls.c

diff --git a/vnet/vnet/mpls/mpls.c b/vnet/vnet/mpls/mpls.c
index c3e642a..0e610e1 100644
--- a/vnet/vnet/mpls/mpls.c
+++ b/vnet/vnet/mpls/mpls.c
@@ -415,17 +415,17 @@
       fib_node_index_t lfe, fib_index;
       u32 fi;
 
-      pfx.fp_proto = FIB_PROTOCOL_MPLS;
-      pfx.fp_len = 21;
-      pfx.fp_label = local_label;
-      pfx.fp_payload_proto = fib_proto_to_dpo(rpaths[0].frp_proto);
-
       if (NULL == rpaths)
       {
 	  error = clib_error_return(0 , "no paths");
 	  goto done;
       }
 
+      pfx.fp_proto = FIB_PROTOCOL_MPLS;
+      pfx.fp_len = 21;
+      pfx.fp_label = local_label;
+      pfx.fp_payload_proto = fib_proto_to_dpo(rpaths[0].frp_proto);
+
       /*
        * the CLI parsing stored table Ids, swap to FIB indicies
        */

vnet/vnet/sr/sr_replicate.c

diff --git a/vnet/vnet/sr/sr_replicate.c b/vnet/vnet/sr/sr_replicate.c
index 34cde3d..5f9de50 100644
--- a/vnet/vnet/sr/sr_replicate.c
+++ b/vnet/vnet/sr/sr_replicate.c
@@ -253,6 +253,8 @@
 		  /* Not the last tunnel to process */
 		  clone0 = rte_pktmbuf_clone
 		    (orig_mb0, bm->pktmbuf_pools[socket_id]);
+		  if (clone0 == 0)
+		    goto clone_fail;
 		  nb_seg = 0;
 		  clone0i = clone0;
 		  clone0_c = NULL;
@@ -289,6 +291,7 @@
 
 	      if (PREDICT_FALSE (!clone0 || !hdr_mb0))
 		{
+		clone_fail:
 		  b0->error = node->errors[SR_REPLICATE_ERROR_NO_BUFFERS];
 
 		  vec_foreach_index (i, rte_mbuf_vec)