diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/ip/ip4_forward.c | 3 | ||||
| -rw-r--r-- | src/vnet/ip/ip6_forward.c | 16 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c index 03b0f3e740a..754bb21fe67 100644 --- a/src/vnet/ip/ip4_forward.c +++ b/src/vnet/ip/ip4_forward.c @@ -1188,6 +1188,9 @@ ip4_tcp_udp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0, break; ASSERT (p0->flags & VLIB_BUFFER_NEXT_PRESENT); + if (!(p0->flags & VLIB_BUFFER_NEXT_PRESENT)) + return 0xfefe; + p0 = vlib_get_buffer (vm, p0->next_buffer); data_this_buffer = vlib_buffer_get_current (p0); n_this_buffer = clib_min (p0->current_length, n_bytes_left); diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c index b6eae6e3811..b990d7c45d2 100644 --- a/src/vnet/ip/ip6_forward.c +++ b/src/vnet/ip/ip6_forward.c @@ -952,10 +952,18 @@ ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0, } n_bytes_left = n_this_buffer = payload_length_host_byte_order; - if (p0 && n_this_buffer + headers_size > p0->current_length) - n_this_buffer = - p0->current_length > - headers_size ? p0->current_length - headers_size : 0; + + 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) + { + n_this_buffer = p0->current_length > headers_size ? + n_ip_bytes_this_buffer - headers_size : 0; + } + } + while (1) { sum0 = ip_incremental_checksum (sum0, data_this_buffer, n_this_buffer); |