From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apyX0-0004R7-41 for qemu-devel@nongnu.org; Tue, 12 Apr 2016 09:39:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1apyWw-0000jg-Mu for qemu-devel@nongnu.org; Tue, 12 Apr 2016 09:39:02 -0400 Received: from mail-qk0-x231.google.com ([2607:f8b0:400d:c09::231]:34830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apyWw-0000jc-Ii for qemu-devel@nongnu.org; Tue, 12 Apr 2016 09:38:58 -0400 Received: by mail-qk0-x231.google.com with SMTP id o6so6127072qkc.2 for ; Tue, 12 Apr 2016 06:38:58 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Tue, 12 Apr 2016 15:38:37 +0200 Message-Id: <1460468317-11863-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH for-2.6] ivshmem: fix crash with ivshmem-plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-André Lureau "qemu -device ivshmem-plain" will crash, because it doesn't check that 'memdev' was provided. Signed-off-by: Marc-André Lureau --- hw/misc/ivshmem.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 08bf5c6..fae4d08 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -868,7 +868,7 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp) s->ivshmem_bar2 = host_memory_backend_get_memory(s->hostmem, &error_abort); - } else { + } else if (s->server_chr) { IVSHMEM_DPRINTF("using shared memory server (socket = %s)\n", s->server_chr->filename); @@ -899,6 +899,8 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp) error_setg(errp, "failed to initialize interrupts"); return; } + } else { + g_assert_not_reached(); } vmstate_register_ram(s->ivshmem_bar2, DEVICE(s)); @@ -1048,10 +1050,25 @@ static void ivshmem_plain_init(Object *obj) &error_abort); } +static void ivshmem_plain_realize(PCIDevice *dev, Error **errp) +{ + IVShmemState *s = IVSHMEM_COMMON(dev); + + if (!s->hostmem) { + error_setg(errp, "You must specify a 'memdev'"); + return; + } + + ivshmem_common_realize(dev, errp); +} + + static void ivshmem_plain_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + k->realize = ivshmem_plain_realize; dc->props = ivshmem_plain_properties; dc->vmsd = &ivshmem_plain_vmsd; } -- 2.5.5