aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@cardoe.com>2011-05-27 12:53:08 -0500
committerDoug Goldstein <cardoe@cardoe.com>2011-05-27 12:53:08 -0500
commitd39bca65a67e79426b82908c840dec96b6a485ce (patch)
tree3f3b0122a54d40d116c0919bd0ee7bbda2e9ba1a
parentIgnore pci unplug requests for unpluggable devices (CVE-2011-1751) (diff)
downloadqemu-kvm-d39bca65a67e79426b82908c840dec96b6a485ce.tar.gz
qemu-kvm-d39bca65a67e79426b82908c840dec96b6a485ce.tar.bz2
qemu-kvm-d39bca65a67e79426b82908c840dec96b6a485ce.zip
Revert "Ignore pci unplug requests for unpluggable devices (CVE-2011-1751)"
This reverts commit 10830d286ef279d3f531c74e51bfab409b507f4a.
-rw-r--r--hw/acpi_piix4.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 161090070..882de96c1 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -579,13 +579,11 @@ static void pciej_write(void *opaque, uint32_t addr, uint32_t val)
BusState *bus = opaque;
DeviceState *qdev, *next;
PCIDevice *dev;
- PCIDeviceInfo *info;
int slot = ffs(val) - 1;
QLIST_FOREACH_SAFE(qdev, &bus->children, sibling, next) {
dev = DO_UPCAST(PCIDevice, qdev, qdev);
- info = container_of(qdev->info, PCIDeviceInfo, qdev);
- if (PCI_SLOT(dev->devfn) == slot && !info->no_hotplug) {
+ if (PCI_SLOT(dev->devfn) == slot) {
qdev_free(qdev);
}
}