From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkBhc-00054t-63 for qemu-devel@nongnu.org; Wed, 14 Sep 2016 11:02:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkBhX-0008F1-HK for qemu-devel@nongnu.org; Wed, 14 Sep 2016 11:02:19 -0400 Date: Wed, 14 Sep 2016 16:02:10 +0100 From: "Daniel P. Berrange" Message-ID: <20160914150210.GA9563@redhat.com> Reply-To: "Daniel P. Berrange" References: <1465309053-5784-1-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1465309053-5784-1-git-send-email-berrange@redhat.com> Subject: Re: [Qemu-devel] [PATCH STABLE 2.5] vnc: fix VNC websockets TLS handshake List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ben Aitchison , qemu-stable@nongnu.org, Gerd Hoffmann ping Is qemu-stable dead for the 2.5 branch or was this just missed ? On Tue, Jun 07, 2016 at 03:17:33PM +0100, Daniel P. Berrange wrote: > If the VNC websockets TLS handshake blocked, we register a > callback to continue it after the socket signals data is > available. Unfortunately we were mistakenly registering > the wrong method callback, causing us to restart the TLS > handshake from the begining, which obviously fails. > > Reported-by: Ben Aitchison > Signed-off-by: Daniel P. Berrange > --- > ui/vnc-ws.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > NB this is a stable-2.5 only patch, with no equiv in master > since the code was totally refactored in 2.6 > > diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c > index 175ea50..a8cf180 100644 > --- a/ui/vnc-ws.c > +++ b/ui/vnc-ws.c > @@ -22,8 +22,9 @@ > #include "qemu/main-loop.h" > #include "crypto/hash.h" > > -static int vncws_start_tls_handshake(VncState *vs) > +static void vncws_run_tls_handshake(void *opaque) > { > + VncState *vs = (VncState *)opaque; > Error *err = NULL; > > if (qcrypto_tls_session_handshake(vs->tls, &err) < 0) { > @@ -42,22 +43,21 @@ static int vncws_start_tls_handshake(VncState *vs) > > case QCRYPTO_TLS_HANDSHAKE_RECVING: > VNC_DEBUG("Handshake interrupted (blocking read)\n"); > - qemu_set_fd_handler(vs->csock, vncws_tls_handshake_io, NULL, vs); > + qemu_set_fd_handler(vs->csock, vncws_run_tls_handshake, NULL, vs); > break; > > case QCRYPTO_TLS_HANDSHAKE_SENDING: > VNC_DEBUG("Handshake interrupted (blocking write)\n"); > - qemu_set_fd_handler(vs->csock, NULL, vncws_tls_handshake_io, vs); > + qemu_set_fd_handler(vs->csock, NULL, vncws_run_tls_handshake, vs); > break; > } > > - return 0; > + return; > > error: > VNC_DEBUG("Handshake failed %s\n", error_get_pretty(err)); > error_free(err); > vnc_client_error(vs); > - return -1; > } > > void vncws_tls_handshake_io(void *opaque) > @@ -84,7 +84,7 @@ void vncws_tls_handshake_io(void *opaque) > vs); > > VNC_DEBUG("Start TLS WS handshake process\n"); > - vncws_start_tls_handshake(vs); > + vncws_run_tls_handshake(vs); > } > > void vncws_handshake_read(void *opaque) > -- > 2.5.5 > Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|