Address COVERITY warnings 90/9590/2
authorMarco Varlese <marco.varlese@suse.com>
Mon, 27 Nov 2017 15:46:04 +0000 (16:46 +0100)
committerChris Luke <chris_luke@comcast.com>
Mon, 27 Nov 2017 18:48:14 +0000 (18:48 +0000)
Among many false positives the potential NULL pointer dereference seems
to be a valid one hence addressing that with this patch.

Change-Id: Ia55784475294e96f60df64baf8820b459bb85bb7
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
src/vnet/geneve/encap.c

index 59d5c96..e9e7e5b 100644 (file)
@@ -153,6 +153,9 @@ geneve_encap_inline (vlib_main_t * vm,
              /* Note: change to always set next0 if it may be set to drop */
              next0 = t0->next_dpo.dpoi_next_node;
            }
+
+         ASSERT (t0 != NULL);
+
          vnet_buffer (b0)->ip.adj_index[VLIB_TX] = t0->next_dpo.dpoi_index;
 
          /* Get next node index and adj index from tunnel next_dpo */
@@ -164,6 +167,9 @@ geneve_encap_inline (vlib_main_t * vm,
              /* Note: change to always set next1 if it may be set to drop */
              next1 = t1->next_dpo.dpoi_next_node;
            }
+
+         ASSERT (t1 != NULL);
+
          vnet_buffer (b1)->ip.adj_index[VLIB_TX] = t1->next_dpo.dpoi_index;
 
          /* Apply the rewrite string. $$$$ vnet_rewrite? */