From: Dave Barach <dave@barachs.net>
Date: Mon, 4 May 2020 18:47:45 +0000 (-0400)
Subject: misc: fix coverity warnings
X-Git-Tag: v20.09-rc0~44
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F26870%2F2;p=vpp.git

misc: fix coverity warnings

Type: fix
Ticket: VPP-1837

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I51660e4b02f449bd2db12a8cfd395c6c343d2dee
---

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 912b9dffd0e..f7a972be7a2 100644
--- a/src/vnet/lisp-cp/one_api.c
+++ b/src/vnet/lisp-cp/one_api.c
@@ -1119,7 +1119,7 @@ one_adjacency_copy (vl_api_one_adjacency_t * dst, lisp_adjacency_t * adjs)
 	  a.leid.address.nsh.si = gid_address_nsh_si (&adj->leid);
 	  break;
 	default:
-	  ASSERT (0);
+	  ALWAYS_ASSERT (0);
 	}
       a.reid.type = eid_type;
       a.leid.type = eid_type;