diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-11-27 09:41:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-27 18:39:32 +0000 |
| commit | 549b50a31d28f2687a47e827a1e17300784a2c44 (patch) | |
| tree | dce8f296c822d08bb22b65e134d8235e6e6c659f /util/vfio-helpers.c | |
| parent | 59ed3fe8d334e3247abb703b8f2eb7c0ac7afc62 (diff) | |
| download | qemu-549b50a31d28f2687a47e827a1e17300784a2c44.zip qemu-549b50a31d28f2687a47e827a1e17300784a2c44.tar.gz qemu-549b50a31d28f2687a47e827a1e17300784a2c44.tar.bz2 | |
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 <armbru@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20181127084143.1113-1-armbru@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/vfio-helpers.c')
| -rw-r--r-- | util/vfio-helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 1d9272e..cccc9cd 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); } /** |