From: Markus Armbruster Date: Tue, 27 Nov 2018 08:41:43 +0000 (+0100) Subject: vfio-helpers: Fix qemu_vfio_open_pci() crash X-Git-Tag: v3.0.1~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93ef995b2c4c39304bde5f2440e0f286aaa160e7;p=thirdparty%2Fqemu.git vfio-helpers: Fix qemu_vfio_open_pci() crash qemu_vfio_open_common() initializes s->lock only after passing s to qemu_vfio_dma_map() via qemu_vfio_init_ramblock(). qemu_vfio_dma_map() tries to lock the uninitialized lock and crashes. Fix by initializing s->lock first. RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1645840 Fixes: 418026ca43bc2626db092d7558258f9594366f28 Cc: qemu-stable@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Cornelia Huck Reviewed-by: Stefan Hajnoczi Message-id: 20181127084143.1113-1-armbru@redhat.com Signed-off-by: Peter Maydell (cherry picked from commit 549b50a31d28f2687a47e827a1e17300784a2c44) Signed-off-by: Michael Roth --- diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 1d9272efa4a..cccc9cd42e1 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -411,13 +411,13 @@ static int qemu_vfio_init_ramblock(const char *block_name, void *host_addr, static void qemu_vfio_open_common(QEMUVFIOState *s) { + qemu_mutex_init(&s->lock); s->ram_notifier.ram_block_added = qemu_vfio_ram_block_added; s->ram_notifier.ram_block_removed = qemu_vfio_ram_block_removed; ram_block_notifier_add(&s->ram_notifier); s->low_water_mark = QEMU_VFIO_IOVA_MIN; s->high_water_mark = QEMU_VFIO_IOVA_MAX; qemu_ram_foreach_block(qemu_vfio_init_ramblock, s); - qemu_mutex_init(&s->lock); } /**