From: Thomas Huth Date: Mon, 14 Aug 2017 06:10:29 +0000 (+0200) Subject: hw/misc/mmio_interface: Return after error_setg() to avoid crash X-Git-Tag: v2.10.0-rc3~12^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a808c0865b720e22ca2929ec3d362d4610fbad51;p=thirdparty%2Fqemu.git hw/misc/mmio_interface: Return after error_setg() to avoid crash QEMU currently abort()s if the user tries to specify the mmio_interface device without parameters: x86_64-softmmu/qemu-system-x86_64 -nographic -device mmio_interface qemu-system-x86_64: /home/thuth/devel/qemu/util/error.c:57: error_setv: Assertion `*errp == ((void *)0)' failed. Aborted (core dumped) This happens because the realize function is trying to set the errp twice in this case. After setting an error, the realize function should immediately return instead. Signed-off-by: Thomas Huth Signed-off-by: Michael Tokarev --- diff --git a/hw/misc/mmio_interface.c b/hw/misc/mmio_interface.c index 6f004d2bab9..da154e5c955 100644 --- a/hw/misc/mmio_interface.c +++ b/hw/misc/mmio_interface.c @@ -63,10 +63,12 @@ static void mmio_interface_realize(DeviceState *dev, Error **errp) if (!s->host_ptr) { error_setg(errp, "host_ptr property must be set"); + return; } if (!s->subregion) { error_setg(errp, "subregion property must be set"); + return; } memory_region_init_ram_ptr(&s->ram_mem, OBJECT(s), "ram",