diff options
author | Daniel P. Berrange <berrange@redhat.com> | 2016-09-30 16:02:01 +0100 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-11-02 17:16:58 -0500 |
commit | 5be5335661a9c28f64e2b4e296063a7387ab498f (patch) | |
tree | 1a18cf66e5cedc1d26593eb19eced68aace15cfa /qemu-char.c | |
parent | af29bd3193015865f6b2ca6f5c9e79aad1df3e28 (diff) | |
download | qemu-5be5335661a9c28f64e2b4e296063a7387ab498f.tar.gz |
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 660a2d83e026496db6b3eaec2256a2cdd6c74de8)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qemu-char.c')
-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 fdb23f5289..90e96271dd 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3096,6 +3096,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); |