From: Fabiano Rosas <[email protected]>
Recent fixes to TLS tasks memory handling have left the TLS bye task
uncovered. Fix by freeing the task in the same way the handshake task
is freed.
Direct leak of 704 byte(s) in 4 object(s) allocated from:
#1 0x7f5909b1d6a0 in g_malloc0 ../glib/gmem.c:163
#2 0x557650496d61 in qio_task_new ../io/task.c:58:12
#3 0x557650475d7f in qio_channel_tls_bye ../io/channel-tls.c:352:12
#4 0x55764f7a1bb4 in migration_tls_channel_end ../migration/tls.c:159:5
#5 0x55764f709750 in migration_ioc_shutdown_gracefully
../migration/multifd.c:462:9
#6 0x55764f6fcf53 in multifd_send_terminate_threads
../migration/multifd.c:493:13
#7 0x55764f6fcafb in multifd_send_shutdown ../migration/multifd.c:580:5
#8 0x55764f6e1b14 in migration_cleanup ../migration/migration.c:1323:9
#9 0x55764f6f5bac in migration_cleanup_bh ../migration/migration.c:1350:5
Fixes: d39d0f3acd ("io: fix cleanup for TLS I/O source data on cancellation")
Fixes: 1b63062f57 ("io: fix cleanup for TLS I/O source data on cancellation")
in 10.0.x series
Reviewed-by: Daniel P. Berrangé <[email protected]>
Acked-by: Daniel P. Berrangé <[email protected]>
Link: https://lore.kernel.org/qemu-devel/[email protected]
Signed-off-by: Fabiano Rosas <[email protected]>
(cherry picked from commit c20f143cc9fb9b1c79627d9f2ecb8daf771bdb4a)
Signed-off-by: Michael Tokarev <[email protected]>
diff --git a/io/channel-tls.c b/io/channel-tls.c
index 329ef6759f..d25a55c107 100644
--- a/io/channel-tls.c
+++ b/io/channel-tls.c
@@ -347,7 +347,9 @@ void qio_channel_tls_bye(QIOChannelTLS *ioc, Error **errp)
task = qio_task_new(OBJECT(ioc), propagate_error, errp, NULL);
trace_qio_channel_tls_bye_start(ioc);
- qio_channel_tls_bye_task(ioc, task, NULL);
+ if (qio_channel_tls_bye_task(ioc, task, NULL)) {
+ qio_task_free(task);
+ }
}
static void qio_channel_tls_init(Object *obj G_GNUC_UNUSED)
--
2.47.3
