[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/15] hw/pci: fix crash on shpc error flow
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 10/15] hw/pci: fix crash on shpc error flow |
Date: |
Mon, 24 Nov 2014 21:31:21 +0200 |
From: Marcel Apfelbaum <address@hidden>
If the pci bridge enters in error flow as part
of init process it will only delete the shpc mmio
subregion but not remove it from the properties list,
resulting in segmentation fault when the bridge runs
the exit function.
Example: add a pci bridge without specifing the chassis number:
<qemu-bin> ... -device pci-bridge,id=p1
Result:
(qemu) qemu-system-x86_64: -device pci-bridge,id=p1: Bridge chassis not
specified. Each bridge is required to be assigned a unique chassis id > 0.
qemu-system-x86_64: -device pci-bridge,id=p1: Device
initialization failed.
Segmentation fault (core dumped)
if (child->class->unparent) {
#0 0x00005555558d629b in object_finalize_child_property
(obj=0x555556d2e830, name=0x555556d30630 "shpc-mmio[0]", opaque=0x555556a42fc8)
at qom/object.c:1078
#1 0x00005555558d4b1f in object_property_del_all (obj=0x555556d2e830) at
qom/object.c:367
#2 0x00005555558d4ca1 in object_finalize (data=0x555556d2e830) at
qom/object.c:412
#3 0x00005555558d55a1 in object_unref (obj=0x555556d2e830) at
qom/object.c:720
#4 0x000055555572c907 in qdev_device_add (opts=0x5555563544f0) at
qdev-monitor.c:566
#5 0x0000555555744f16 in device_init_func (opts=0x5555563544f0,
opaque=0x0) at vl.c:2213
#6 0x00005555559cf5f0 in qemu_opts_foreach (list=0x555555e0f8e0
<qemu_device_opts>, func=0x555555744efa <device_init_func>, opaque=0x0,
abort_on_failure=1) at util/qemu-option.c:1057
#7 0x000055555574a11b in main (argc=16, argv=0x7fffffffdde8,
envp=0x7fffffffde70) at vl.c:423
Unparent the shpc mmio region as part of shpc cleanup.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Amos Kong <address@hidden>
---
hw/pci/shpc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index 9a39060..27c496e 100644
--- a/hw/pci/shpc.c
+++ b/hw/pci/shpc.c
@@ -663,6 +663,7 @@ void shpc_cleanup(PCIDevice *d, MemoryRegion *bar)
SHPCDevice *shpc = d->shpc;
d->cap_present &= ~QEMU_PCI_CAP_SHPC;
memory_region_del_subregion(bar, &shpc->mmio);
+ object_unparent(OBJECT(&shpc->mmio));
/* TODO: cleanup config space changes? */
g_free(shpc->config);
g_free(shpc->cmask);
--
MST
- [Qemu-devel] [PULL v2 05/15] memory: expose alignment used for allocating RAM as MemoryRegion API, (continued)
- [Qemu-devel] [PULL v2 05/15] memory: expose alignment used for allocating RAM as MemoryRegion API, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 06/15] pc: align DIMM's address/size by backend's alignment value, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 09/15] pc: count in 1Gb hugepage alignment when sizing hotplug-memory container, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 11/15] acpi-build: mark RAM dirty on table update, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 07/15] pc: pc-dimm: use backend alignment during address auto allocation, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 12/15] target-i386: move generic memory hotplug methods to DSDTs, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 13/15] pcie: fix typo in pcie_cap_deverr_init(), Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 14/15] pcie: fix improper use of negative value, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 15/15] pc: acpi: mark all possible CPUs as enabled in SRAT, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 08/15] pc: explicitly check maxmem limit when adding DIMM, Michael S. Tsirkin, 2014/11/24
- [Qemu-devel] [PULL v2 10/15] hw/pci: fix crash on shpc error flow,
Michael S. Tsirkin <=
- Re: [Qemu-devel] [PULL v2 00/15] pc, pci, misc bugfixes, Peter Maydell, 2014/11/25