From: Roger Pau Monné <roger.pau@citrix.com>
Date: Tue, 27 Mar 2018 08:28:24 +0000 (+0200)
Subject: vpci: make sure handlers can deal with size == 0
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~313
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7fd3a2efddb1a3582efba283b2df82b3dfdea5f;p=xen.git

vpci: make sure handlers can deal with size == 0

The code is not prepared to handle such case, so just return early. In
the debug case add an assert.

Coverity ID: 1430809

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c
index 2913b56500..82607bdb9a 100644
--- a/xen/drivers/vpci/vpci.c
+++ b/xen/drivers/vpci/vpci.c
@@ -320,6 +320,12 @@ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size)
     unsigned int data_offset = 0;
     uint32_t data = ~(uint32_t)0;
 
+    if ( !size )
+    {
+        ASSERT_UNREACHABLE();
+        return data;
+    }
+
     /* Find the PCI dev matching the address. */
     pdev = pci_get_pdev_by_domain(d, sbdf.seg, sbdf.bus, sbdf.extfunc);
     if ( !pdev )
@@ -416,6 +422,12 @@ void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size,
     const struct vpci_register *r;
     unsigned int data_offset = 0;
 
+    if ( !size )
+    {
+        ASSERT_UNREACHABLE();
+        return;
+    }
+
     /*
      * Find the PCI dev matching the address.
      * Passthrough everything that's not trapped.