commit 133c91c1c06e7c773ba675181901ba0dcf955ae6
author Mohsin Kazmi <sykazmi@cisco.com> Thu Aug 20 17:18:56 2020 +0200
committer Benoît Ganne <bganne@cisco.com> Mon Aug 31 09:05:02 2020 +0000
tree 83000f26d297fde5ba53d0916b7b57ca9446a770
parent 2b79341dcafe8fa9397acf42b8021c88664db2df

virtio: fix the coverity warning

Type: fix

Change-Id: I6c6d66ad8aa158be8d2b9d111de7d46473b9dc02
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>

src/vnet/devices/virtio/pci.c

diff --git a/src/vnet/devices/virtio/pci.c b/src/vnet/devices/virtio/pci.c
index 494a3f3..1e94bbd 100644
--- a/src/vnet/devices/virtio/pci.c
+++ b/src/vnet/devices/virtio/pci.c
@@ -727,8 +727,13 @@
 			"[%4x] cfg type: %u, bar: %u, offset: %04x, len: %u",
 			pos, cap.cfg_type, cap.bar, cap.offset, cap.length);
 
-      vif->bar = bar[cap.bar];
-      vif->bar_id = cap.bar;
+      if (cap.bar >= 1 && cap.bar <= 5)
+	{
+	  vif->bar = bar[cap.bar];
+	  vif->bar_id = cap.bar;
+	}
+      else
+	return clib_error_return (error, "invalid bar %u", cap.bar);
 
       switch (cap.cfg_type)
 	{

src/vnet/devices/virtio/virtio_pci_legacy.c

diff --git a/src/vnet/devices/virtio/virtio_pci_legacy.c b/src/vnet/devices/virtio/virtio_pci_legacy.c
index f70776d..cf1d841 100644
--- a/src/vnet/devices/virtio/virtio_pci_legacy.c
+++ b/src/vnet/devices/virtio/virtio_pci_legacy.c
@@ -113,8 +113,10 @@
       clib_warning ("only 32 bit features are allowed for legacy virtio!");
     }
   u32 features = 0;
+  u32 gf = (u32) guest_features;
+
   vlib_pci_write_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_GUEST_FEATURES,
-			 (u32 *) & guest_features);
+			 &gf);
   vlib_pci_read_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_GUEST_FEATURES,
 			&features);
   if (features != (u32) guest_features)
@@ -178,14 +180,13 @@
 			       u16 queue_id, void *p)
 {
   u64 addr = vlib_physmem_get_pa (vm, p) >> VIRTIO_PCI_QUEUE_ADDR_SHIFT;
-  u32 addr2 = 0;
+  u32 addr2 = 0, a = (u32) addr;
   vlib_pci_write_io_u16 (vm, vif->pci_dev_handle, VIRTIO_PCI_QUEUE_SEL,
 			 &queue_id);
-  vlib_pci_write_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_QUEUE_PFN,
-			 (u32 *) & addr);
+  vlib_pci_write_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_QUEUE_PFN, &a);
   vlib_pci_read_io_u32 (vm, vif->pci_dev_handle, VIRTIO_PCI_QUEUE_PFN,
 			&addr2);
-  if ((u32) addr == addr2)
+  if (addr == addr2)
     return 0;
 
   clib_warning ("legacy queue setup failed!");