commit 8b7bf2badac25c0a52aff1b181ad75fdb304dd0c
author Dr. David Alan Gilbert <dgilbert@redhat.com> Mon Apr 30 19:59:43 2018 +0100
committer Juan Quintela <quintela@redhat.com> Tue May 15 22:13:08 2018 +0200
tree 6bc44dca41c05e82f01f3f5521d3f455a60c3c3d
parent 5e50cae409a0f43332efe594a67827cb4ee66c28

Migration+TLS: Fix crash due to double cleanup

During a TLS connect we see:
  migration_channel_connect calls
  migration_tls_channel_connect
  (calls after TLS setup)
  migration_channel_connect

My previous error handling fix made migration_channel_connect
call migrate_fd_connect in all cases; unfortunately the above
means it gets called twice and crashes doing double cleanup.

Fixes: 688a3dcba98

Reported-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20180430185943.35714-1-dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>

migration/channel.c

diff --git a/migration/channel.c b/migration/channel.c
index 716192b..33e0e9b 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -71,6 +71,15 @@
             !object_dynamic_cast(OBJECT(ioc),
                                  TYPE_QIO_CHANNEL_TLS)) {
             migration_tls_channel_connect(s, ioc, hostname, &error);
+
+            if (!error) {
+                /* tls_channel_connect will call back to this
+                 * function after the TLS handshake,
+                 * so we mustn't call migrate_fd_connect until then
+                 */
+
+                return;
+            }
         } else {
             QEMUFile *f = qemu_fopen_channel_output(ioc);