From 287d819f015a624f321d34491e30b62a05912298 Mon Sep 17 00:00:00 2001

From: Stefan Hajnoczi <stefanha@redhat.com>

Date: Thu, 15 Aug 2019 13:23:10 +0100

Subject: [PATCH 08/10] iothread: fix crash with invalid properties

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Stefan Hajnoczi <stefanha@redhat.com>

Message-id: <20190815132311.22027-2-stefanha@redhat.com>

Patchwork-id: 89995

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 1/2] iothread: fix crash with invalid properties

Bugzilla: 1687541

RH-Acked-by: Peter Xu <peterx@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Markus Armbruster <armbru@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

-object iothread,id=foo,? will crash qemu:

qemu-system-x86_64:qemu-thread-posix.c:128: qemu_cond_destroy: Assertion `cond->initialized' failed.

Use thread_id != -1 to check if iothread_complete() finished

successfully and the mutex/cond have been initialized.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Message-Id: <20180821100716.13803-1-marcandre.lureau@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>

(cherry picked from commit 14a2d11825ddc37d6547a80704ae6450e9e376c7)

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 iothread.c | 9 ++++++---

 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/iothread.c b/iothread.c

index aff1281..2fb1cdf 100644

--- a/iothread.c

+++ b/iothread.c

@@ -110,6 +110,7 @@ static void iothread_instance_init(Object *obj)

     IOThread *iothread = IOTHREAD(obj);

     iothread->poll_max_ns = IOTHREAD_POLL_MAX_NS_DEFAULT;

+    iothread->thread_id = -1;

 }

 static void iothread_instance_finalize(Object *obj)

@@ -117,6 +118,11 @@ static void iothread_instance_finalize(Object *obj)

     IOThread *iothread = IOTHREAD(obj);

     iothread_stop(iothread);

+

+    if (iothread->thread_id != -1) {

+        qemu_cond_destroy(&iothread->init_done_cond);

+        qemu_mutex_destroy(&iothread->init_done_lock);

+    }

     /*

      * Before glib2 2.33.10, there is a glib2 bug that GSource context

      * pointer may not be cleared even if the context has already been

@@ -135,8 +141,6 @@ static void iothread_instance_finalize(Object *obj)

         g_main_context_unref(iothread->worker_context);

         iothread->worker_context = NULL;

     }

-    qemu_cond_destroy(&iothread->init_done_cond);

-    qemu_mutex_destroy(&iothread->init_done_lock);

 }

 static void iothread_complete(UserCreatable *obj, Error **errp)

@@ -147,7 +151,6 @@ static void iothread_complete(UserCreatable *obj, Error **errp)

     iothread->stopping = false;

     iothread->running = true;

-    iothread->thread_id = -1;

     iothread->ctx = aio_context_new(&local_error);

     if (!iothread->ctx) {

         error_propagate(errp, local_error);

-- 

1.8.3.1