59eb7ad892
CVE-2017-15038: 9p: information disclosure when reading extended attributes (bz #1499111) CVE-2017-15268: potential memory exhaustion via websock connection to VNC (bz #1496882)
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
Date: Tue, 29 Aug 2017 17:04:52 +0100
|
|
Subject: [PATCH] io: fix check for handshake completion in TLS test
|
|
|
|
The TLS I/O channel test had mistakenly used && instead
|
|
of || when checking for handshake completion. As a
|
|
result it could terminate the handshake process before
|
|
it had actually completed. This was harmless before but
|
|
changes in GNUTLS 3.6.0 exposed this bug and caused the
|
|
test suite to fail.
|
|
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
---
|
|
tests/test-io-channel-tls.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
|
|
index 8eaa208e1b..e7c80f46cf 100644
|
|
--- a/tests/test-io-channel-tls.c
|
|
+++ b/tests/test-io-channel-tls.c
|
|
@@ -218,7 +218,7 @@ static void test_io_channel_tls(const void *opaque)
|
|
mainloop = g_main_context_default();
|
|
do {
|
|
g_main_context_iteration(mainloop, TRUE);
|
|
- } while (!clientHandshake.finished &&
|
|
+ } while (!clientHandshake.finished ||
|
|
!serverHandshake.finished);
|
|
|
|
g_assert(clientHandshake.failed == data->expectClientFail);
|