diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-10-14 08:52:43 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-10-14 22:43:13 +0000 |
| commit | a66020becd7d01eefea55244cbcf5df9679a9443 (patch) | |
| tree | 5cfe7b89b470b8db5afd7c5c491f945142f95563 /src/vnet/fib/fib_entry.c | |
| parent | ef3c11ca93b651611af33ab3e5d64217504d221d (diff) | |
fib: recursive calculation leads to delegate pool realloc
Type: fix
Change-Id: Ib7ac53d1b59b641ccd3b1d733107d7f1ba174314
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/fib/fib_entry.c')
| -rw-r--r-- | src/vnet/fib/fib_entry.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c index 9169dccff8a..833fcb33fcd 100644 --- a/src/vnet/fib/fib_entry.c +++ b/src/vnet/fib/fib_entry.c @@ -470,9 +470,12 @@ fib_entry_contribute_forwarding (fib_node_index_t fib_entry_index, if (NULL == fed) { - fed = fib_entry_delegate_find_or_add( - fib_entry, - fib_entry_chain_type_to_delegate_type(fct)); + /* + * use a temporary DPO lest the delegate realloc in the recursive + * calculation. + */ + dpo_id_t tmp = DPO_INVALID; + /* * on-demand create eos/non-eos. * There is no on-demand delete because: @@ -483,7 +486,14 @@ fib_entry_contribute_forwarding (fib_node_index_t fib_entry_index, fib_entry_src_mk_lb(fib_entry, fib_entry_get_best_src_i(fib_entry), fct, - &fed->fd_dpo); + &tmp); + + fed = fib_entry_delegate_find_or_add( + fib_entry, + fib_entry_chain_type_to_delegate_type(fct)); + + dpo_copy(&fed->fd_dpo, &tmp); + dpo_reset(&tmp); } dpo_copy(dpo, &fed->fd_dpo); |