From a633a4318bea2f9edcb80d9685b0f811cac679ea Mon Sep 17 00:00:00 2001 From: johny Date: Fri, 6 Dec 2019 13:58:35 +0100 Subject: [PATCH] ip: coverity fix Delete Null-checking "p0" in function ip6_tcp_udp_icmp_bad_length, because it's not necessary. Type: fix Signed-off-by: johny Change-Id: I2bf43a60c1c1d76e42581df27f2285c9e9563093 --- src/vnet/ip/ip6_forward.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c index 959ff890f73..128204f2c2e 100644 --- a/src/vnet/ip/ip6_forward.c +++ b/src/vnet/ip/ip6_forward.c @@ -1161,15 +1161,13 @@ ip6_tcp_udp_icmp_bad_length (vlib_main_t * vm, vlib_buffer_t * p0) payload_length_host_byte_order = clib_net_to_host_u16 (ip0->payload_length); n_bytes_left = n_this_buffer = payload_length_host_byte_order; - if (p0) + + u32 n_ip_bytes_this_buffer = + p0->current_length - (((u8 *) ip0 - p0->data) - p0->current_data); + if (n_this_buffer + headers_size > n_ip_bytes_this_buffer) { - u32 n_ip_bytes_this_buffer = - p0->current_length - (((u8 *) ip0 - p0->data) - p0->current_data); - if (n_this_buffer + headers_size > n_ip_bytes_this_buffer) - { - n_this_buffer = p0->current_length > headers_size ? - n_ip_bytes_this_buffer - headers_size : 0; - } + n_this_buffer = p0->current_length > headers_size ? + n_ip_bytes_this_buffer - headers_size : 0; } n_bytes_left -= n_this_buffer; -- 2.16.6