diff options
| author |   Ole Troan <ot@cisco.com> | 2018-09-19 12:38:51 +0200 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2018-09-27 08:47:40 +0000 |
| commit | 282093f1fe783b5d36a014d4495995cd64e2e3fb (patch) | |
| tree | 09e6536da14c262d33991383e408b2c35d361b4a /src/vnet/ip/icmp6.c | |
| parent | e23edac38ec239115689fe252b4b41a3556f6280 (diff) | |
IPIP and IPv6 fragmentation
- Error where ICMPv6 error code doesn't reset VLIB_TX = -1
Leading to crash for ICMP generated on tunnelled packets
- Missed setting VNET_BUFFER_F_LOCALLY_ORIGINATED, so
IP in IPv6 packets never got fragmented.
- Add support for fragmentation of buffer chains.
- Remove support for inner fragmentation in frag code itself.
Change-Id: If9a97301b7e35ca97ffa5c0fada2b9e7e7dbfb27
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/vnet/ip/icmp6.c')
| -rw-r--r-- | src/vnet/ip/icmp6.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c index 6ebdef4745e..4252ac7ad59 100644 --- a/src/vnet/ip/icmp6.c +++ b/src/vnet/ip/icmp6.c @@ -524,14 +524,24 @@ ip6_icmp_error (vlib_main_t * vm, { b = vlib_get_buffer (vm, b->next_buffer); b->current_length = 0; + // XXX: Buffer leak??? } } /* Add IP header and ICMPv6 header including a 4 byte data field */ - vlib_buffer_advance (p0, - -sizeof (ip6_header_t) - - sizeof (icmp46_header_t) - 4); + int headroom = sizeof (ip6_header_t) + sizeof (icmp46_header_t) + 4; + /* Verify that we're not falling off the edge */ + if (p0->current_data - headroom < -VLIB_BUFFER_PRE_DATA_SIZE) + { + next0 = IP6_ICMP_ERROR_NEXT_DROP; + error0 = ICMP6_ERROR_DROP; + goto error; + } + + vlib_buffer_advance (p0, -headroom); + vnet_buffer (p0)->sw_if_index[VLIB_TX] = ~0; + p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; p0->current_length = p0->current_length > 1280 ? 1280 : p0->current_length; @@ -561,6 +571,7 @@ ip6_icmp_error (vlib_main_t * vm, { next0 = IP6_ICMP_ERROR_NEXT_DROP; error0 = ICMP6_ERROR_DROP; + goto error; } /* Fill icmp header fields */ @@ -573,11 +584,11 @@ ip6_icmp_error (vlib_main_t * vm, ip6_tcp_udp_icmp_compute_checksum (vm, p0, out_ip0, &bogus_length); - - /* Update error status */ if (error0 == ICMP6_ERROR_NONE) error0 = icmp6_icmp_type_to_error (icmp0->type); + + error: vlib_error_count (vm, node->node_index, error0, 1); /* Verify speculative enqueue, maybe switch current next frame */ @@ -602,7 +613,7 @@ VLIB_REGISTER_NODE (ip6_icmp_error_node) = { .n_next_nodes = IP6_ICMP_ERROR_N_NEXT, .next_nodes = { - [IP6_ICMP_ERROR_NEXT_DROP] = "ip6-drop", + [IP6_ICMP_ERROR_NEXT_DROP] = "error-drop", [IP6_ICMP_ERROR_NEXT_LOOKUP] = "ip6-lookup", }, |