falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

char: fix missing return in error path for chardev TLS init 

If the qio_channel_tls_new_(server|client) methods fail,
we disconnect the client. Unfortunately a missing return
means we then go on to try and run the TLS handshake on
a NULL I/O channel. This gives predictably segfaulty
results.

The main way to trigger this is to request a bogus TLS
priority string for the TLS credentials. e.g.

  -object tls-creds-x509,id=tls0,priority=wibble,...

Most other ways appear impossible to trigger except
perhaps if OOM conditions cause gnutls initialization
to fail.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 660a2d83e0)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Daniel P. Berrange 2016-09-30 16:02:01 +01:00 committed by Michael Roth
parent af29bd3193
commit 5be5335661
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qemu-char.c
View File

@ -3096,6 +3096,7 @@ static void tcp_chr_tls_init(CharDriverState *chr)
if (tioc == NULL) { if (tioc == NULL) {
error_free(err); error_free(err);
tcp_chr_disconnect(chr); tcp_chr_disconnect(chr);
return;
} }
object_unref(OBJECT(s->ioc)); object_unref(OBJECT(s->ioc));
s->ioc = QIO_CHANNEL(tioc); s->ioc = QIO_CHANNEL(tioc);