From: Steven <sluong@cisco.com>
Date: Thu, 28 Sep 2017 23:38:56 +0000 (-0700)
Subject: cdp/lldp: punt for no buffer
X-Git-Tag: v18.04-rc0~535
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F8591%2F1;p=vpp.git

cdp/lldp: punt for no buffer

When making a call to vlib_packet_template_get_packet(), it
is possible to get back a NULL if the system runs out of buffer.
This can happen when there is buffer leaks. But don't crash
just because we run out of buffers, just punt.

Change-Id: Ie90ea41f3dda6e583d48959cbd18ff124158d7f8
Signed-off-by: Steven <sluong@cisco.com>
---

diff --git a/src/vnet/cdp/cdp_periodic.c b/src/vnet/cdp/cdp_periodic.c
index de111079aa3..8899c49ce9c 100644
--- a/src/vnet/cdp/cdp_periodic.c
+++ b/src/vnet/cdp/cdp_periodic.c
@@ -125,6 +125,9 @@ send_ethernet_hello (cdp_main_t * cm, cdp_neighbor_t * n, int count)
       h0 = vlib_packet_template_get_packet
 	(vm, &cm->packet_templates[n->packet_template_index], &bi0);
 
+      if (!h0)
+	break;
+
       /* Add the interface's ethernet source address */
       hw = vnet_get_sup_hw_interface (vnm, n->sw_if_index);
 
diff --git a/src/vnet/lldp/lldp_output.c b/src/vnet/lldp/lldp_output.c
index 950b79aebc6..8698ec976ac 100644
--- a/src/vnet/lldp/lldp_output.c
+++ b/src/vnet/lldp/lldp_output.c
@@ -145,6 +145,9 @@ lldp_send_ethernet (lldp_main_t * lm, lldp_intf_t * n, int shutdown)
    */
   h0 = vlib_packet_template_get_packet (vm, &lm->packet_template, &bi0);
 
+  if (!h0)
+    return;
+
   /* Add the interface's ethernet source address */
   hw = vnet_get_hw_interface (vnm, n->hw_if_index);