On Mon, Apr 30, 2018 at 07:59:43PM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
>
> 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
This fixes the crash, but we're still seeing error messages duplicated
(qemu) migrate_set_parameter tls-creds tls0
(qemu) migrate tcp:localhost:9000
qemu-system-x86_64: Certificate does not match the hostname localhost
qemu-system-x86_64: Certificate does not match the hostname localhost
git bisect points to 688a3dcba98 as the cause of these double
errors still.
>
> Reported-by: Peter Krempa <pkre...@redhat.com>
> Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> migration/channel.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/migration/channel.c b/migration/channel.c
> index c5eaf0fa0e..7a32b5aca4 100644
> --- a/migration/channel.c
> +++ b/migration/channel.c
> @@ -71,6 +71,15 @@ void migration_channel_connect(MigrationState *s,
> !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);
>
> --
> 2.17.0
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
