public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: kvm@vger.kernel.org
Cc: alex.williamson@redhat.com, ddutile@redhat.com, mst@redhat.com,
	chrisw@redhat.com
Subject: [PATCH 3/5] pci: Error on PCI capability collisions
Date: Fri, 03 Dec 2010 12:33:57 -0700	[thread overview]
Message-ID: <20101203193351.3579.5502.stgit@s20.home> (raw)
In-Reply-To: <20101203192343.3579.73722.stgit@s20.home>

Nothing good can happen when we overlap capabilities

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---

 hw/pci.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index b08113d..288d6fd 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1845,6 +1845,20 @@ int pci_add_capability(PCIDevice *pdev, uint8_t cap_id,
         if (!offset) {
             return -ENOSPC;
         }
+    } else {
+        int i;
+
+        for (i = offset; i < offset + size; i++) {
+            if (pdev->config_map[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;


  parent reply	other threads:[~2010-12-03 19:33 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-03 19:33 [PATCH 0/5] Extra capabilities for device assignment Alex Williamson
2010-12-03 19:33 ` [PATCH 1/5] device-assignment: Fix off-by-one in header check Alex Williamson
2010-12-03 19:33 ` [PATCH 2/5] pci: MSI-X capability is 12 bytes, not 16, MSI is 10 bytes Alex Williamson
2010-12-03 19:37   ` Chris Wright
2010-12-03 19:48     ` Alex Williamson
2010-12-03 19:54       ` Chris Wright
2010-12-03 19:33 ` Alex Williamson [this message]
2010-12-03 19:34 ` [PATCH 4/5] device-assignment: Error checking when adding capabilities Alex Williamson
2010-12-03 19:34 ` [PATCH 5/5] device-assignment: pass through and stub more PCI caps Alex Williamson
2010-12-06 16:21 ` [PATCH v2 0/5] Extra capabilities for device assignment Alex Williamson
2010-12-06 16:22   ` [PATCH v2 1/5] device-assignment: Fix off-by-one in header check Alex Williamson
2010-12-06 16:22   ` [PATCH v2 2/5] pci: Remove PCI_CAPABILITY_CONFIG_* Alex Williamson
2010-12-06 16:22   ` [PATCH v2 3/5] pci: Error on PCI capability collisions Alex Williamson
2010-12-06 16:22   ` [PATCH v2 4/5] device-assignment: Error checking when adding capabilities Alex Williamson
2010-12-06 16:23   ` [PATCH v2 5/5] device-assignment: pass through and stub more PCI caps Alex Williamson
2010-12-06 16:34   ` [PATCH v2 0/5] Extra capabilities for device assignment Avi Kivity
2010-12-06 16:43     ` Alex Williamson
2010-12-06 17:03       ` Avi Kivity
2010-12-09 15:13         ` Markus Armbruster
2010-12-09 15:32           ` Avi Kivity
2010-12-09 16:17             ` Alex Williamson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101203193351.3579.5502.stgit@s20.home \
    --to=alex.williamson@redhat.com \
    --cc=chrisw@redhat.com \
    --cc=ddutile@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox