aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-05-04 14:47:45 -0400
committerAndrew Yourtchenko <ayourtch@gmail.com>2020-08-18 09:54:56 +0000
commitd63d353faa54b5a0a8724d7491c15331b5dcc006 (patch)
treec33d78830adf9418d0224c30fffb2df7bd6479d8
parent6e25cf65050f98fe5f0c9f6d91a5d3375b0cd608 (diff)
misc: fix coverity warnings
Type: fix Ticket: VPP-1837 Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: I51660e4b02f449bd2db12a8cfd395c6c343d2dee (cherry picked from commit c72950e811880c22e5b350c4b1cb5e31b0735b4d)
-rw-r--r--src/vlib/linux/pci.c2
-rw-r--r--src/vnet/lisp-cp/one_api.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c
index 8af1cdab0d4..722fb888117 100644
--- a/src/vlib/linux/pci.c
+++ b/src/vlib/linux/pci.c
@@ -1137,7 +1137,7 @@ vlib_pci_map_region_int (vlib_main_t * vm, vlib_pci_dev_handle_t h,
if (*result == (void *) -1)
{
error = clib_error_return_unix (0, "mmap `BAR%u'", bar);
- if (p->type == LINUX_PCI_DEVICE_TYPE_UIO)
+ if (p->type == LINUX_PCI_DEVICE_TYPE_UIO && (fd != -1))
close (fd);
return error;
}
diff --git a/src/vnet/lisp-cp/one_api.c b/src/vnet/lisp-cp/one_api.c
index 56cb74b0c77..e96e950cfea 100644
--- a/src/vnet/lisp-cp/one_api.c
+++ b/src/vnet/lisp-cp/one_api.c
@@ -1214,7 +1214,7 @@ one_adjacency_copy (vl_api_one_adjacency_t * dst, lisp_adjacency_t * adjs)
clib_memcpy (a.leid, &nsh, sizeof (nsh));
break;
default:
- ASSERT (0);
+ ALWAYS_ASSERT (0);
}
dst[i] = a;
}