commit 084606befb45507e9241b5555f86196fe08530f6
author John Lo <loj@cisco.com> Tue Jun 19 15:27:48 2018 -0400
committer Dave Barach <openvpp@barachs.net> Tue Jun 19 21:26:10 2018 +0000
tree 25982dd871832335b2f62159657c3b3b31e361f2
parent 7e607a73898b81c21a24038a2350fdda3b1c67ff

Check get packet template allocation failure (VPP-1321)

After calling vlib_packet_template_get_packet(), make sure
packet buffer is allocated before using it.

Change-Id: Idb5199f4e2c9596137b2101e502d611f474a6ffe
Signed-off-by: John Lo <loj@cisco.com>

src/vnet/ip/ip6_neighbor.c

diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c
index e281d7e..6d91224 100644
--- a/src/vnet/ip/ip6_neighbor.c
+++ b/src/vnet/ip/ip6_neighbor.c
@@ -466,6 +466,8 @@
   h = vlib_packet_template_get_packet (vm,
 				       &im->discover_neighbor_packet_template,
 				       &bi);
+  if (!h)
+    return;
 
   hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
 
@@ -3285,6 +3287,8 @@
 
 	    h0 = vlib_packet_template_get_packet
 	      (vm, &im->discover_neighbor_packet_template, &bi0);
+	    if (!h0)
+	      continue;
 
 	    /*
 	     * Build ethernet header.
@@ -5037,6 +5041,9 @@
 	vlib_packet_template_get_packet (vm,
 					 &i6m->discover_neighbor_packet_template,
 					 &bi);
+      if (!h)
+	return;
+
       ip6_set_reserved_multicast_address (&h->ip.dst_address,
 					  IP6_MULTICAST_SCOPE_link_local,
 					  IP6_MULTICAST_GROUP_ID_all_hosts);