From b7fd3a2efddb1a3582efba283b2df82b3dfdea5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Tue, 27 Mar 2018 10:28:24 +0200 Subject: [PATCH] vpci: make sure handlers can deal with size == 0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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é Reviewed-by: Jan Beulich --- xen/drivers/vpci/vpci.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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. -- 2.30.2