From d55f62f78888315c6caa58c9c7638c8109bb37cd Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 8 Apr 2020 08:14:57 -0400 Subject: misc: check return values from vlib_buffer_copy(...) vlib_buffer_copy(...) returns NULL if the system is temporarily out of buffers. This is NOT correct. Please don't be this person: c0 = vlib_buffer_copy (vm, p0); ci0 = vlib_get_buffer_index (vm, c0); Type: fix Signed-off-by: Dave Barach Change-Id: Ic25ef58965871ea5d2b40904df9506803f69e47e (cherry picked from commit 954c707972bf7efcd227e26d9679544813a78115) --- src/plugins/dhcp/dhcp4_proxy_error.def | 2 +- src/plugins/dhcp/dhcp4_proxy_node.c | 7 +++++++ src/plugins/dhcp/dhcp6_ia_na_client_dp.c | 3 +++ src/plugins/dhcp/dhcp6_pd_client_dp.c | 3 +++ src/plugins/dhcp/dhcp6_proxy_error.def | 1 + src/plugins/dhcp/dhcp6_proxy_node.c | 7 +++++++ src/plugins/ioam/encap/ip6_ioam_trace.c | 8 +++++--- src/vnet/ip6-nd/ip6_ra.c | 3 +++ 8 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/plugins/dhcp/dhcp4_proxy_error.def b/src/plugins/dhcp/dhcp4_proxy_error.def index 83f11830ab6..bd814e34ff8 100644 --- a/src/plugins/dhcp/dhcp4_proxy_error.def +++ b/src/plugins/dhcp/dhcp4_proxy_error.def @@ -30,4 +30,4 @@ dhcp_proxy_error (BAD_YIADDR, "DHCP packets with bad your_ip_address fields") dhcp_proxy_error (BAD_SVR_FIB_OR_ADDRESS, "DHCP packets not from DHCP server or server FIB.") dhcp_proxy_error (PKT_TOO_BIG, "DHCP packets which are too big.") dhcp_proxy_error (FOR_US, "DHCP packets for local client.") - +dhcp_proxy_error (ALLOC_FAIL, "DHCP buffer allocation failures.") diff --git a/src/plugins/dhcp/dhcp4_proxy_node.c b/src/plugins/dhcp/dhcp4_proxy_node.c index 53c95c09f12..28c3e624aa1 100644 --- a/src/plugins/dhcp/dhcp4_proxy_node.c +++ b/src/plugins/dhcp/dhcp4_proxy_node.c @@ -364,6 +364,13 @@ dhcp_proxy_to_server_input (vlib_main_t * vm, u32 ci0; c0 = vlib_buffer_copy (vm, b0); + if (c0 == NULL) + { + vlib_node_increment_counter + (vm, dhcp_proxy_to_server_node.index, + DHCP_PROXY_ERROR_ALLOC_FAIL, 1); + continue; + } VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0); ci0 = vlib_get_buffer_index (vm, c0); server = &proxy->dhcp_servers[ii]; diff --git a/src/plugins/dhcp/dhcp6_ia_na_client_dp.c b/src/plugins/dhcp/dhcp6_ia_na_client_dp.c index 3cf2fb1b349..c240beb3eb3 100644 --- a/src/plugins/dhcp/dhcp6_ia_na_client_dp.c +++ b/src/plugins/dhcp/dhcp6_ia_na_client_dp.c @@ -258,6 +258,9 @@ check_send_client_message (vlib_main_t * vm, next_index = ip6_rewrite_mcast_node.index; c0 = vlib_buffer_copy (vm, p0); + if (c0 == NULL) + return client_state->keep_sending_client_message; + ci0 = vlib_get_buffer_index (vm, c0); ip = (ip6_header_t *) vlib_buffer_get_current (c0); diff --git a/src/plugins/dhcp/dhcp6_pd_client_dp.c b/src/plugins/dhcp/dhcp6_pd_client_dp.c index 980c83c7bbe..b43e5a4754d 100644 --- a/src/plugins/dhcp/dhcp6_pd_client_dp.c +++ b/src/plugins/dhcp/dhcp6_pd_client_dp.c @@ -264,6 +264,9 @@ check_pd_send_client_message (vlib_main_t * vm, next_index = ip6_rewrite_mcast_node.index; c0 = vlib_buffer_copy (vm, p0); + if (c0 == NULL) + return client_state->keep_sending_client_message; + ci0 = vlib_get_buffer_index (vm, c0); ip = (ip6_header_t *) vlib_buffer_get_current (c0); diff --git a/src/plugins/dhcp/dhcp6_proxy_error.def b/src/plugins/dhcp/dhcp6_proxy_error.def index 55fa731766c..5a85c423c5f 100644 --- a/src/plugins/dhcp/dhcp6_proxy_error.def +++ b/src/plugins/dhcp/dhcp6_proxy_error.def @@ -27,3 +27,4 @@ dhcpv6_proxy_error (NO_RELAY_MESSAGE_OPTION, "DHCPv6 reply packets without relay dhcpv6_proxy_error (BAD_SVR_FIB_OR_ADDRESS, "DHCPv6 packets not from DHCPv6 server or server FIB.") dhcpv6_proxy_error (PKT_TOO_BIG, "DHCPv6 packets which are too big.") dhcpv6_proxy_error (WRONG_INTERFACE_ID_OPTION, "DHCPv6 reply to invalid interface.") +dhcpv6_proxy_error (ALLOC_FAIL, "DHCPv6 buffer allocation failures.") diff --git a/src/plugins/dhcp/dhcp6_proxy_node.c b/src/plugins/dhcp/dhcp6_proxy_node.c index 272c379b6a3..95e5c9272f5 100644 --- a/src/plugins/dhcp/dhcp6_proxy_node.c +++ b/src/plugins/dhcp/dhcp6_proxy_node.c @@ -437,6 +437,13 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm, u32 ci0; c0 = vlib_buffer_copy (vm, b0); + if (c0 == NULL) + { + vlib_node_increment_counter + (vm, dhcpv6_proxy_to_server_node.index, + DHCPV6_PROXY_ERROR_ALLOC_FAIL, 1); + continue; + } VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0); ci0 = vlib_get_buffer_index (vm, c0); server = &proxy->dhcp_servers[ii]; diff --git a/src/plugins/ioam/encap/ip6_ioam_trace.c b/src/plugins/ioam/encap/ip6_ioam_trace.c index 53fb63ea6fd..23448575798 100644 --- a/src/plugins/ioam/encap/ip6_ioam_trace.c +++ b/src/plugins/ioam/encap/ip6_ioam_trace.c @@ -222,14 +222,16 @@ ip6_hbh_ioam_loopback_handler (vlib_buffer_t * b, ip6_header_t * ip, ioam_trace_option_t *opt; udp_ping_t *udp; + b0 = vlib_buffer_copy (hm->vlib_main, b); + if (b0 == NULL) + return; + + buf_index = vlib_get_buffer_index (hm->vlib_main, b0); next_node = vlib_get_node_by_name (hm->vlib_main, (u8 *) "ip6-lookup"); nf = vlib_get_frame_to_node (hm->vlib_main, next_node->index); nf->n_vectors = 0; to_next = vlib_frame_vector_args (nf); - b0 = vlib_buffer_copy (hm->vlib_main, b); - buf_index = vlib_get_buffer_index (hm->vlib_main, b0); - vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0; vnet_buffer (b0)->sw_if_index[VLIB_TX] = ~0; diff --git a/src/vnet/ip6-nd/ip6_ra.c b/src/vnet/ip6-nd/ip6_ra.c index 769f9dabe5c..af82a06eb2b 100644 --- a/src/vnet/ip6-nd/ip6_ra.c +++ b/src/vnet/ip6-nd/ip6_ra.c @@ -1219,6 +1219,9 @@ check_send_rs (vlib_main_t * vm, ip6_ra_t * radv_info, f64 current_time, next_index = ip6_rewrite_mcast_node.index; c0 = vlib_buffer_copy (vm, p0); + if (c0 == NULL) + return radv_info->keep_sending_rs; + ci0 = vlib_get_buffer_index (vm, c0); f = vlib_get_frame_to_node (vm, next_index); -- cgit 1.2.3-korg