From 53be16d053328941f4738d83385a9c19b2c3776a Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Tue, 15 Dec 2020 21:47:36 +0100 Subject: ip: fix possible missing trace indexes Add safeguards when tracing packets to avoid cases where clear trace was issue while buffers were held in reassembly. Type: fix Change-Id: I1bdd1e629e8bc08ce63913fd3c4b2327e47dec04 Signed-off-by: Klement Sekera --- src/vnet/ip/reass/ip6_full_reass.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/vnet/ip/reass/ip6_full_reass.c') diff --git a/src/vnet/ip/reass/ip6_full_reass.c b/src/vnet/ip/reass/ip6_full_reass.c index 80a31e83215..fe5c6376882 100644 --- a/src/vnet/ip/reass/ip6_full_reass.c +++ b/src/vnet/ip/reass/ip6_full_reass.c @@ -319,6 +319,13 @@ ip6_full_reass_add_trace (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_buffer_t *b = vlib_get_buffer (vm, bi); vnet_buffer_opaque_t *vnb = vnet_buffer (b); bool is_after_handoff = false; + if (pool_is_free_index + (vm->trace_main.trace_buffer_pool, vlib_buffer_get_trace_index (b))) + { + // this buffer's trace is gone + b->flags &= ~VLIB_BUFFER_IS_TRACED; + return; + } if (vlib_buffer_get_trace_thread (b) != vm->thread_index) { is_after_handoff = true; -- cgit 1.2.3-korg