]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
acpi: validate hotplug selector on access
authorMichael S. Tsirkin <mst@redhat.com>
Tue, 21 Dec 2021 14:45:44 +0000 (09:45 -0500)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 6 Jan 2022 11:11:38 +0000 (06:11 -0500)
When bus is looked up on a pci write, we didn't
validate that the lookup succeeded.
Fuzzers thus can trigger QEMU crash by dereferencing the NULL
bus pointer.

Fixes: b32bd763a1 ("pci: introduce acpi-index property for PCI device")
Fixes: CVE-2021-4158
Cc: "Igor Mammedov" <imammedo@redhat.com>
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/770
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
hw/acpi/pcihp.c

index 30405b5113d7fb5a259a9d9cbd761d59ae5cbe59..a5e182dd3a372fee2805923a314c0ecf8789471f 100644 (file)
@@ -491,6 +491,9 @@ static void pci_write(void *opaque, hwaddr addr, uint64_t data,
         }
 
         bus = acpi_pcihp_find_hotplug_bus(s, s->hotplug_select);
+        if (!bus) {
+            break;
+        }
         QTAILQ_FOREACH_SAFE(kid, &bus->qbus.children, sibling, next) {
             Object *o = OBJECT(kid->child);
             PCIDevice *dev = PCI_DEVICE(o);