diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-09-30 16:02:01 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2016-10-08 11:25:29 +0300 |
| commit | 660a2d83e026496db6b3eaec2256a2cdd6c74de8 (patch) | |
| tree | 51ca0acda319a2bf24aa7d6ebd44fc02f8d9d52d | |
| parent | 56bef8511a576deef32d3e763b993b5001015c2d (diff) | |
| download | focaccia-qemu-660a2d83e026496db6b3eaec2256a2cdd6c74de8.tar.gz focaccia-qemu-660a2d83e026496db6b3eaec2256a2cdd6c74de8.zip | |
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>
| -rw-r--r-- | qemu-char.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu-char.c b/qemu-char.c index fb456cec34..48a45ef583 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3132,6 +3132,7 @@ static void tcp_chr_tls_init(CharDriverState *chr) if (tioc == NULL) { error_free(err); tcp_chr_disconnect(chr); + return; } object_unref(OBJECT(s->ioc)); s->ioc = QIO_CHANNEL(tioc); |