From c022b2fe399809eda173a748ca050ffc34c18025 Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Sat, 18 Sep 2021 17:32:17 +0500 Subject: fib: fix crash on exporter tracker remove Exported entries are tracked only when the prefix found in the export FIB is really attached, exporter tracker is not set if the export entry is not valid for export, ex. for special FIB entries - default route, zeronet, mcast and broadcast prefixes. When imported entries need to be purged, such unset exporter tracker is being removed by non-initialized index with absent delegate entries, causing corresponding assert and crash. Type: fix Signed-off-by: Vladislav Grishenko Change-Id: Ib24a2e7853a03a960577872480213e1e8097da5a --- src/vnet/fib/fib_attached_export.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/vnet/fib') diff --git a/src/vnet/fib/fib_attached_export.c b/src/vnet/fib/fib_attached_export.c index 5ea96fd0cf6..206d10e7140 100644 --- a/src/vnet/fib/fib_attached_export.c +++ b/src/vnet/fib/fib_attached_export.c @@ -106,8 +106,7 @@ fib_entry_ae_add_or_lock (fib_node_index_t connected) { fed = fib_entry_delegate_find_or_add(entry, FIB_ENTRY_DELEGATE_ATTACHED_EXPORT); - pool_get(fib_ae_export_pool, export); - clib_memset(export, 0, sizeof(*export)); + pool_get_zero(fib_ae_export_pool, export); fed->fd_index = (export - fib_ae_export_pool); export->faee_ei = connected; @@ -249,13 +248,14 @@ fib_attached_export_import (fib_entry_t *fib_entry, */ fei = fib_entry_get_index(fib_entry); - pool_get(fib_ae_import_pool, import); + pool_get_zero(fib_ae_import_pool, import); import->faei_import_fib = fib_entry->fe_fib_index; import->faei_export_fib = export_fib; import->faei_prefix = fib_entry->fe_prefix; import->faei_import_entry = fib_entry_get_index(fib_entry); import->faei_export_sibling = ~0; + import->faei_exporter = FIB_NODE_INDEX_INVALID; /* * do an exact match in the export table @@ -273,7 +273,6 @@ fib_attached_export_import (fib_entry_t *fib_entry, import->faei_export_entry = fib_table_lookup(import->faei_export_fib, &import->faei_prefix); - import->faei_exporter = FIB_NODE_INDEX_INVALID; } else { -- cgit 1.2.3-korg