ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fib: Another realloc burn

Browse Source 
Type: fix

harmless this time since it only affects the debug statement, but
it still crashes an ASAN image.

Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: Ie02e7fe3014b98b9f8c83447f59017a380ab3948
This commit is contained in:
Neale Ranns
2019-11-21 09:37:41 +00:00
committed by Damjan Marion
parent 2b65f9ca04
commit 981a690b7d
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vnet/fib/fib_entry.c
View File

@ -712,7 +712,7 @@ fib_entry_post_flag_update_actions (fib_entry_t *fib_entry,
return (fib_entry); return (fib_entry);
} }
static void static fib_entry_t*
fib_entry_post_install_actions (fib_entry_t *fib_entry, fib_entry_post_install_actions (fib_entry_t *fib_entry,
fib_source_t source, fib_source_t source,
fib_entry_flag_t old_flags) fib_entry_flag_t old_flags)
@ -720,6 +720,8 @@ fib_entry_post_install_actions (fib_entry_t *fib_entry,
fib_entry = fib_entry_post_flag_update_actions(fib_entry, fib_entry = fib_entry_post_flag_update_actions(fib_entry,
old_flags); old_flags);
fib_entry_src_action_installed(fib_entry, source); fib_entry_src_action_installed(fib_entry, source);
return (fib_entry);
} }
fib_node_index_t fib_node_index_t
@ -754,7 +756,8 @@ fib_entry_create (u32 fib_index,
fib_entry = fib_entry_get(fib_entry_index); fib_entry = fib_entry_get(fib_entry_index);
fib_entry_src_action_activate(fib_entry, source); fib_entry_src_action_activate(fib_entry, source);
fib_entry_post_install_actions(fib_entry, source, FIB_ENTRY_FLAG_NONE); fib_entry = fib_entry_post_install_actions(fib_entry, source,
FIB_ENTRY_FLAG_NONE);
FIB_ENTRY_DBG(fib_entry, "create"); FIB_ENTRY_DBG(fib_entry, "create");
@ -782,7 +785,8 @@ fib_entry_create_special (u32 fib_index,
fib_entry = fib_entry_src_action_add(fib_entry, source, flags, dpo); fib_entry = fib_entry_src_action_add(fib_entry, source, flags, dpo);
fib_entry_src_action_activate(fib_entry, source); fib_entry_src_action_activate(fib_entry, source);
fib_entry_post_install_actions(fib_entry, source, FIB_ENTRY_FLAG_NONE); fib_entry = fib_entry_post_install_actions(fib_entry, source,
FIB_ENTRY_FLAG_NONE);
FIB_ENTRY_DBG(fib_entry, "create-special"); FIB_ENTRY_DBG(fib_entry, "create-special");
@ -1308,7 +1312,9 @@ fib_entry_cover_changed (fib_node_index_t fib_entry_index)
fib_entry_src_action_reactivate(fib_entry, fib_entry_src_action_reactivate(fib_entry,
fib_entry_src_get_source( fib_entry_src_get_source(
fib_entry_get_best_src_i(fib_entry))); fib_entry_get_best_src_i(fib_entry)));
fib_entry_post_install_actions(fib_entry, best_source, bflags); fib_entry = fib_entry_post_install_actions(fib_entry,
best_source,
bflags);
} }
else else
{ {
@ -1382,7 +1388,9 @@ fib_entry_cover_updated (fib_node_index_t fib_entry_index)
fib_entry_src_action_reactivate(fib_entry, fib_entry_src_action_reactivate(fib_entry,
fib_entry_src_get_source( fib_entry_src_get_source(
fib_entry_get_best_src_i(fib_entry))); fib_entry_get_best_src_i(fib_entry)));
fib_entry_post_install_actions(fib_entry, best_source, bflags); fib_entry = fib_entry_post_install_actions(fib_entry,
best_source,
bflags);
} }
else else
{ {