From 47d41ad62c5d6008e72d2e9c137cf8f49ca86353 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Mon, 17 Feb 2020 09:13:26 -0500 Subject: misc: fix coverity warnings Add an ALWAYS_ASSERT (...) macro, to (a) shut up coverity, and (b) check the indicated condition in production images. As in: p = hash_get(...); ALWAYS_ASSERT(p) /* was ASSERT(p) */ elt = pool_elt_at_index(pool, p[0]); This may not be the best way to handle a specific case, but failure to check return values at all followed by e.g. a pointer dereference isn't ok. Type: fix Ticket: VPP-1837 Signed-off-by: Dave Barach Change-Id: Ia97c641cefcfb7ea7d77ea5a55ed4afea0345acb --- src/vnet/fib/fib_attached_export.c | 8 ++++---- 1 file changed, 4 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 3c9c2bffee6..4a33b8897f5 100644 --- a/src/vnet/fib/fib_attached_export.c +++ b/src/vnet/fib/fib_attached_export.c @@ -364,7 +364,7 @@ fib_attached_export_purge (fib_entry_t *fib_entry) fed = fib_entry_delegate_find(export_entry, FIB_ENTRY_DELEGATE_ATTACHED_EXPORT); - ASSERT(NULL != fed); + ALWAYS_ASSERT(NULL != fed); export = pool_elt_at_index(fib_ae_export_pool, fed->fd_index); @@ -391,7 +391,7 @@ fib_attached_export_purge (fib_entry_t *fib_entry) pool_put(fib_ae_import_pool, import); fib_entry_delegate_remove(fib_entry, FIB_ENTRY_DELEGATE_ATTACHED_IMPORT); - } + } } void @@ -522,7 +522,7 @@ fib_ae_import_format (fib_node_index_t impi, s = format(s, "export-sibling:%d ", import->faei_export_sibling); s = format(s, "exporter:%d ", import->faei_exporter); s = format(s, "export-fib:%d ", import->faei_export_fib); - + s = format(s, "import-entry:%d ", import->faei_import_entry); s = format(s, "import-fib:%d ", import->faei_import_fib); @@ -544,7 +544,7 @@ fib_ae_export_format (fib_node_index_t expi, fib_ae_export_t *export; export = pool_elt_at_index(fib_ae_export_pool, expi); - + s = format(s, "\n Attached-Export:%d:[", (export - fib_ae_export_pool)); s = format(s, "export-entry:%d ", export->faee_ei); -- cgit 1.2.3-korg