diff options
| author |   Steven <sluong@cisco.com> | 2017-09-28 16:38:56 -0700 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2017-10-07 19:10:07 +0000 |
| commit | da1eadcf4e6f76562cc87f317fb96a02d3e54eef (patch) | |
| tree | ec26269dcbecbe27d083185a5d0856e8e760c3a2 /src/vnet | |
| parent | 16d12cf1861bd56c83cc8437944c290a59a34a79 (diff) | |
cdp/lldp: punt for no buffer (VPP-997)
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>
(cherry picked from commit 0ff5c563d5048991dbd02a3892dccde8305a7e30)
(cherry picked from commit 1808f3c00a7bcdea7f0c004ef0613db2156c2065)
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/cdp/cdp_periodic.c | 3 | ||||
| -rw-r--r-- | src/vnet/lldp/lldp_output.c | 3 |
2 files changed, 6 insertions, 0 deletions
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); |