From 30684ac044bbb8e11ef100a24c01eb37ba7a8876 Mon Sep 17 00:00:00 2001 From: Chris Luke Date: Thu, 29 Mar 2018 12:56:58 -0700 Subject: Coverity fixes (VPP-1204) Minor bug fixes CID 183000: double close CID 180996: dead code CID 180995: NULL deref CID 181957: NULL deref CID 182676: NULL deref CID 182675: NULL deref Change-Id: Id35e391c95fafb8cd771984ee8a1a6e597056d37 Signed-off-by: Chris Luke --- src/vnet/ip/ip4_reassembly.c | 2 ++ src/vnet/ip/ip6_reassembly.c | 2 ++ src/vnet/ip/ip_api.c | 1 + 3 files changed, 5 insertions(+) (limited to 'src/vnet/ip') diff --git a/src/vnet/ip/ip4_reassembly.c b/src/vnet/ip/ip4_reassembly.c index 114d8e052f8..b94a25819b7 100644 --- a/src/vnet/ip/ip4_reassembly.c +++ b/src/vnet/ip/ip4_reassembly.c @@ -497,6 +497,8 @@ ip4_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, reass.next_range_bi; } while (~0 != sub_chain_bi); + + ASSERT (last_b != NULL); last_b->flags &= ~VLIB_BUFFER_NEXT_PRESENT; ASSERT (rt->buffers_n >= (buf_cnt - dropped_cnt)); rt->buffers_n -= buf_cnt - dropped_cnt; diff --git a/src/vnet/ip/ip6_reassembly.c b/src/vnet/ip/ip6_reassembly.c index c6424a7309c..1be5b5ef546 100644 --- a/src/vnet/ip/ip6_reassembly.c +++ b/src/vnet/ip/ip6_reassembly.c @@ -534,6 +534,8 @@ ip6_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, reass.next_range_bi; } while (~0 != sub_chain_bi); + + ASSERT (last_b != NULL); last_b->flags &= ~VLIB_BUFFER_NEXT_PRESENT; vlib_buffer_t *first_b = vlib_get_buffer (vm, reass->first_bi); ASSERT (total_length >= first_b->current_length); diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c index a8dbb3ae36c..0b0a7a949e0 100644 --- a/src/vnet/ip/ip_api.c +++ b/src/vnet/ip/ip_api.c @@ -2253,6 +2253,7 @@ wc_arp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) ({ vl_api_registration_t *vl_reg; vl_reg = vl_api_client_index_to_registration (reg->client_index); + ASSERT (vl_reg != NULL); if (reg && vl_api_can_send_msg (vl_reg)) { vl_api_ip4_arp_event_t * event = vl_msg_api_alloc (sizeof *event); -- cgit 1.2.3-korg