From: Marc-André Lureau <[email protected]>
The QIONetListener mutex is initialized in the convenience
constructor qio_net_listener_new() rather than in an instance_init.
This means a bare object_new(TYPE_QIO_NET_LISTENER) produces an
object with an uninitialized mutex, but instance_finalize
unconditionally calls qemu_mutex_destroy() on it, which aborts.
Move the mutex initialization to a proper instance_init so that init
and finalize are always paired regardless of how the object is
created.
Fixes: 9d86181874a ("qio: Protect NetListener callback with mutex")
Cc: [email protected]
Reviewed-by: Daniel P. Berrangé <[email protected]>
Reviewed-by: Peter Xu <[email protected]>
Signed-off-by: Marc-André Lureau <[email protected]>
---
io/net-listener.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/io/net-listener.c b/io/net-listener.c
index 9410d72da9c..1fd0f6cb5ab 100644
--- a/io/net-listener.c
+++ b/io/net-listener.c
@@ -38,7 +38,6 @@ QIONetListener *qio_net_listener_new(void)
QIONetListener *listener;
listener = QIO_NET_LISTENER(object_new(TYPE_QIO_NET_LISTENER));
- qemu_mutex_init(&listener->lock);
return listener;
}
@@ -440,6 +439,13 @@ qio_net_listener_get_local_address(QIONetListener
*listener, size_t n,
return qio_channel_socket_get_local_address(sioc, errp);
}
+static void qio_net_listener_instance_init(Object *obj)
+{
+ QIONetListener *listener = QIO_NET_LISTENER(obj);
+
+ qemu_mutex_init(&listener->lock);
+}
+
static void qio_net_listener_finalize(Object *obj)
{
QIONetListener *listener = QIO_NET_LISTENER(obj);
@@ -463,6 +469,7 @@ static const TypeInfo qio_net_listener_info = {
.parent = TYPE_OBJECT,
.name = TYPE_QIO_NET_LISTENER,
.instance_size = sizeof(QIONetListener),
+ .instance_init = qio_net_listener_instance_init,
.instance_finalize = qio_net_listener_finalize,
};
--
2.54.0
