From d35abc4c674f9540d9b0c49dead21328cf57e08d Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Thu, 18 Apr 2019 09:42:20 +0000 Subject: FIB: recursion casues path realloc Change-Id: Ie9c2954eee90ca1a1fc1aa8280f93b2340b544c1 Signed-off-by: Neale Ranns --- src/vnet/fib/fib_path.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c index 55013a992e3..67a4bc1d4de 100644 --- a/src/vnet/fib/fib_path.c +++ b/src/vnet/fib/fib_path.c @@ -1883,6 +1883,9 @@ fib_path_resolve (fib_node_index_t path_index) fib_path_attached_next_hop_set(path); break; case FIB_PATH_TYPE_ATTACHED: + { + dpo_id_t tmp = DPO_INVALID; + /* * path->attached.fp_interface */ @@ -1891,12 +1894,18 @@ fib_path_resolve (fib_node_index_t path_index) { path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED; } - dpo_set(&path->fp_dpo, + dpo_set(&tmp, DPO_ADJACENCY, path->fp_nh_proto, fib_path_attached_get_adj(path, dpo_proto_to_link(path->fp_nh_proto))); + /* + * re-fetch after possible mem realloc + */ + path = fib_path_get(path_index); + dpo_copy(&path->fp_dpo, &tmp); + /* * become a child of the adjacency so we receive updates * when the interface state changes @@ -1904,7 +1913,9 @@ fib_path_resolve (fib_node_index_t path_index) path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index, FIB_NODE_TYPE_PATH, fib_path_get_index(path)); + dpo_reset(&tmp); break; + } case FIB_PATH_TYPE_RECURSIVE: { /* -- cgit 1.2.3-korg