diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2019-04-30 13:01:08 +0200 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2019-04-30 11:52:57 +0000 |
| commit | f369e3a7d0e4ab17c55fe1ebd2e9d4b6d6929d61 (patch) | |
| tree | 29fb787d966dcd0a5a69df59a54343238fed8a38 /src/vnet/ip | |
| parent | c4a0afe5a61fc059eeee056c236e6a4f2412118d (diff) | |
reassembly: avoid race-conditions
Change-Id: Ibf5c283217a985e43a562f1969573eeb26ee6017
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vnet/ip')
| -rw-r--r-- | src/vnet/ip/ip4_reassembly.c | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/src/vnet/ip/ip4_reassembly.c b/src/vnet/ip/ip4_reassembly.c index 446df33a0a4..b38ade09efd 100644 --- a/src/vnet/ip/ip4_reassembly.c +++ b/src/vnet/ip/ip4_reassembly.c @@ -475,7 +475,7 @@ ip4_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, if (trim_front > tmp->current_length) { /* drop whole buffer */ - vlib_buffer_free_one (vm, tmp_bi); + u32 to_be_freed_bi = tmp_bi; trim_front -= tmp->current_length; if (!(tmp->flags & VLIB_BUFFER_NEXT_PRESENT)) { @@ -484,6 +484,7 @@ ip4_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, tmp->flags &= ~VLIB_BUFFER_NEXT_PRESENT; tmp_bi = tmp->next_buffer; tmp = vlib_get_buffer (vm, tmp_bi); + vlib_buffer_free_one (vm, to_be_freed_bi); continue; } else @@ -514,23 +515,34 @@ ip4_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node, } } total_length += tmp->current_length; + if (tmp->flags & VLIB_BUFFER_NEXT_PRESENT) + { + tmp_bi = tmp->next_buffer; + tmp = vlib_get_buffer (vm, tmp->next_buffer); + } + else + { + break; + } } else { - vlib_buffer_free_one (vm, tmp_bi); + u32 to_be_freed_bi = tmp_bi; if (reass->first_bi == tmp_bi) { return IP4_REASS_RC_INTERNAL_ERROR; } - } - if (tmp->flags & VLIB_BUFFER_NEXT_PRESENT) - { - tmp_bi = tmp->next_buffer; - tmp = vlib_get_buffer (vm, tmp->next_buffer); - } - else - { - break; + if (tmp->flags & VLIB_BUFFER_NEXT_PRESENT) + { + tmp_bi = tmp->next_buffer; + tmp = vlib_get_buffer (vm, tmp->next_buffer); + vlib_buffer_free_one (vm, to_be_freed_bi); + } + else + { + vlib_buffer_free_one (vm, to_be_freed_bi); + break; + } } } sub_chain_bi = @@ -672,7 +684,7 @@ ip4_reass_remove_range_from_chain (vlib_main_t * vm, reass->data_len -= ip4_reass_buffer_get_data_len (discard_b); while (1) { - vlib_buffer_free_one (vm, discard_bi); + u32 to_be_freed_bi = discard_bi; if (PREDICT_FALSE (discard_b->flags & VLIB_BUFFER_IS_TRACED)) { ip4_reass_add_trace (vm, node, rm, reass, discard_bi, RANGE_DISCARD, @@ -683,9 +695,11 @@ ip4_reass_remove_range_from_chain (vlib_main_t * vm, discard_b->flags &= ~VLIB_BUFFER_NEXT_PRESENT; discard_bi = discard_b->next_buffer; discard_b = vlib_get_buffer (vm, discard_bi); + vlib_buffer_free_one (vm, to_be_freed_bi); } else { + vlib_buffer_free_one (vm, to_be_freed_bi); break; } } |