qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: "Igor Mammedov" <imammedo@redhat.com>,
	"Shaoqin Huang" <shahuang@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
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	[thread overview]
Message-ID: <20230526090840.2225958-14-thuth@redhat.com> (raw)
In-Reply-To: <20230526090840.2225958-1-thuth@redhat.com>

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



  parent reply	other threads:[~2023-05-26  9:11 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-26  9:08 [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330 Thomas Huth
2023-05-26  9:08 ` [PULL 01/15] hw/hppa: Use MachineClass->default_nic in the hppa machine Thomas Huth
2023-05-26  9:08 ` [PULL 02/15] hw/alpha: Use MachineClass->default_nic in the alpha machine Thomas Huth
2023-05-26  9:08 ` [PULL 03/15] hw/arm: Use MachineClass->default_nic in the virt machine Thomas Huth
2023-05-26  9:08 ` [PULL 04/15] hw/loongarch64: " Thomas Huth
2023-05-26  9:08 ` [PULL 05/15] hw/xtensa: " Thomas Huth
2023-05-26  9:08 ` [PULL 06/15] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine Thomas Huth
2023-05-26  9:08 ` [PULL 07/15] hw/mips: Use MachineClass->default_nic in the virt machine Thomas Huth
2023-05-26  9:08 ` [PULL 08/15] tests/qtest/usb-hcd-uhci-test: Check whether "usb-storage" is available Thomas Huth
2023-05-26  9:08 ` [PULL 09/15] tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine Thomas Huth
2023-05-26  9:08 ` [PULL 10/15] tests/qtest/rtl8139-test: Check whether the rtl8139 device is available Thomas Huth
2023-05-26  9:08 ` [PULL 11/15] tests/qtest/usb-hcd-ehci-test: Check for EHCI and UHCI HCDs before using them Thomas Huth
2023-05-26  9:08 ` [PULL 12/15] tests/qtest/ac97-test: add up-/downsampling tests Thomas Huth
2023-05-26  9:08 ` Thomas Huth [this message]
2023-05-26  9:08 ` [PULL 14/15] lsi53c895a: disable reentrancy detection for MMIO region, too Thomas Huth
2023-05-26  9:08 ` [PULL 15/15] hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI controller (CVE-2023-0330) Thomas Huth
2023-05-26 16:17 ` [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330 Richard Henderson

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=20230526090840.2225958-14-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=shahuang@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;
as well as URLs for NNTP newsgroup(s).