[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/15] machine: do not crash if default RAM backend name has been
|
From: |
Thomas Huth |
|
Subject: |
[PULL 13/15] machine: do not crash if default RAM backend name has been stolen |
|
Date: |
Fri, 26 May 2023 11:08:38 +0200 |
From: Igor Mammedov <imammedo@redhat.com>
QEMU aborts when default RAM backend should be used (i.e. no
explicit '-machine memory-backend=' specified) but user
has created an object which 'id' equals to default RAM backend
name used by board.
$QEMU -machine pc \
-object memory-backend-ram,id=pc.ram,size=4294967296
Actual results:
QEMU 7.2.0 monitor - type 'help' for more information
(qemu) Unexpected error in object_property_try_add() at ../qom/object.c:1239:
qemu-kvm: attempt to add duplicate property 'pc.ram' to object (type
'container')
Aborted (core dumped)
Instead of abort, check for the conflicting 'id' and exit with
an error, suggesting how to remedy the issue.
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2207886
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20230522131717.3780533-1-imammedo@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Shaoqin Huang <shahuang@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/core/machine.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 07f763eb2e..1000406211 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1338,6 +1338,14 @@ void machine_run_board_init(MachineState *machine, const
char *mem_path, Error *
}
} else if (machine_class->default_ram_id && machine->ram_size &&
numa_uses_legacy_mem()) {
+ if (object_property_find(object_get_objects_root(),
+ machine_class->default_ram_id)) {
+ error_setg(errp, "object name '%s' is reserved for the default"
+ " RAM backend, it can't be used for any other purposes."
+ " Change the object's 'id' to something else",
+ machine_class->default_ram_id);
+ return;
+ }
if (!create_default_memdev(current_machine, mem_path, errp)) {
return;
}
--
2.31.1
- [PULL 01/15] hw/hppa: Use MachineClass->default_nic in the hppa machine, (continued)
- [PULL 01/15] hw/hppa: Use MachineClass->default_nic in the hppa machine, Thomas Huth, 2023/05/26
- [PULL 04/15] hw/loongarch64: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 03/15] hw/arm: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 06/15] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine, Thomas Huth, 2023/05/26
- [PULL 05/15] hw/xtensa: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 08/15] tests/qtest/usb-hcd-uhci-test: Check whether "usb-storage" is available, Thomas Huth, 2023/05/26
- [PULL 10/15] tests/qtest/rtl8139-test: Check whether the rtl8139 device is available, Thomas Huth, 2023/05/26
- [PULL 07/15] hw/mips: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 09/15] tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine, Thomas Huth, 2023/05/26
- [PULL 11/15] tests/qtest/usb-hcd-ehci-test: Check for EHCI and UHCI HCDs before using them, Thomas Huth, 2023/05/26
- [PULL 13/15] machine: do not crash if default RAM backend name has been stolen,
Thomas Huth <=
- [PULL 14/15] lsi53c895a: disable reentrancy detection for MMIO region, too, Thomas Huth, 2023/05/26
- [PULL 15/15] hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI controller (CVE-2023-0330), Thomas Huth, 2023/05/26
- [PULL 12/15] tests/qtest/ac97-test: add up-/downsampling tests, Thomas Huth, 2023/05/26
- Re: [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330, Richard Henderson, 2023/05/26