From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvulo-00068Y-Ou for qemu-devel@nongnu.org; Tue, 23 Aug 2011 13:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qvuln-0005QL-Ef for qemu-devel@nongnu.org; Tue, 23 Aug 2011 13:28:12 -0400 Received: from goliath.siemens.de ([192.35.17.28]:24928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvuln-0005QC-5r for qemu-devel@nongnu.org; Tue, 23 Aug 2011 13:28:11 -0400 Message-ID: <4E53E328.90601@siemens.com> Date: Tue, 23 Aug 2011 19:28:08 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] pci: Error on PCI capability collisions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Alex Williamson , qemu-devel From: Alex Williamson Nothing good can happen when we overlap capabilities [ Jan: rebased over qemu, minor formatting ] Signed-off-by: Jan Kiszka --- hw/pci.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 6124790..ff20631 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1952,11 +1952,25 @@ int pci_add_capability(PCIDevice *pdev, uint8_t cap_id, uint8_t offset, uint8_t size) { uint8_t *config; + int i; + if (!offset) { offset = pci_find_space(pdev, size); if (!offset) { return -ENOSPC; } + } else { + for (i = offset; i < offset + size; i++) { + if (pdev->used[i]) { + fprintf(stderr, "ERROR: %04x:%02x:%02x.%x " + "Attempt to add PCI capability %x at offset " + "%x overlaps existing capability %x at offset %x\n", + pci_find_domain(pdev->bus), pci_bus_num(pdev->bus), + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), + cap_id, offset, pdev->config_map[i], i); + return -EFAULT; + } + } } config = pdev->config + offset; -- 1.7.3.4