[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/12] io: return 0 for EOF in TLS session read after
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 06/12] io: return 0 for EOF in TLS session read after shutdown |
Date: |
Mon, 19 Nov 2018 11:54:21 -0600 |
From: Daniel P. Berrangé <address@hidden>
GNUTLS takes a paranoid approach when seeing 0 bytes returned by the
underlying OS read() function. It will consider this an error and
return GNUTLS_E_PREMATURE_TERMINATION instead of propagating the 0
return value. It expects apps to arrange for clean termination at
the protocol level and not rely on seeing EOF from a read call to
detect shutdown. This is to harden apps against a malicious 3rd party
causing termination of the sockets layer.
This is unhelpful for the QEMU NBD code which does have a clean
protocol level shutdown, but still relies on seeing 0 from the I/O
channel read in the coroutine handling incoming replies.
The upshot is that when using a plain NBD connection shutdown is
silent, but when using TLS, the client spams the console with
Cannot read from TLS channel: Broken pipe
The NBD connection has, however, called qio_channel_shutdown()
at this point to indicate that it is done with I/O. This gives
the opportunity to optimize the code such that when the channel
has been shutdown in the read direction, the error code
GNUTLS_E_PREMATURE_TERMINATION gets turned into a '0' return
instead of an error.
Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
include/io/channel-tls.h | 1 +
include/io/channel.h | 6 +++---
crypto/tlssession.c | 3 +++
io/channel-tls.c | 5 +++++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/include/io/channel-tls.h b/include/io/channel-tls.h
index 87fcaf91463..fdbdf12feb1 100644
--- a/include/io/channel-tls.h
+++ b/include/io/channel-tls.h
@@ -48,6 +48,7 @@ struct QIOChannelTLS {
QIOChannel parent;
QIOChannel *master;
QCryptoTLSSession *session;
+ QIOChannelShutdown shutdown;
};
/**
diff --git a/include/io/channel.h b/include/io/channel.h
index e8cdadb0b07..da2f1382002 100644
--- a/include/io/channel.h
+++ b/include/io/channel.h
@@ -51,9 +51,9 @@ enum QIOChannelFeature {
typedef enum QIOChannelShutdown QIOChannelShutdown;
enum QIOChannelShutdown {
- QIO_CHANNEL_SHUTDOWN_BOTH,
- QIO_CHANNEL_SHUTDOWN_READ,
- QIO_CHANNEL_SHUTDOWN_WRITE,
+ QIO_CHANNEL_SHUTDOWN_READ = 1,
+ QIO_CHANNEL_SHUTDOWN_WRITE = 2,
+ QIO_CHANNEL_SHUTDOWN_BOTH = 3,
};
typedef gboolean (*QIOChannelFunc)(QIOChannel *ioc,
diff --git a/crypto/tlssession.c b/crypto/tlssession.c
index 2f28fa7f71b..0dedd4af526 100644
--- a/crypto/tlssession.c
+++ b/crypto/tlssession.c
@@ -473,6 +473,9 @@ qcrypto_tls_session_read(QCryptoTLSSession *session,
case GNUTLS_E_INTERRUPTED:
errno = EINTR;
break;
+ case GNUTLS_E_PREMATURE_TERMINATION:
+ errno = ECONNABORTED;
+ break;
default:
errno = EIO;
break;
diff --git a/io/channel-tls.c b/io/channel-tls.c
index 9628e6fa479..c98ead21b01 100644
--- a/io/channel-tls.c
+++ b/io/channel-tls.c
@@ -275,6 +275,9 @@ static ssize_t qio_channel_tls_readv(QIOChannel *ioc,
} else {
return QIO_CHANNEL_ERR_BLOCK;
}
+ } else if (errno == ECONNABORTED &&
+ (tioc->shutdown & QIO_CHANNEL_SHUTDOWN_READ)) {
+ return 0;
}
error_setg_errno(errp, errno,
@@ -357,6 +360,8 @@ static int qio_channel_tls_shutdown(QIOChannel *ioc,
{
QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc);
+ tioc->shutdown |= how;
+
return qio_channel_shutdown(tioc->master, how, errp);
}
--
2.17.2
- [Qemu-devel] [PULL 00/12] NBD patches for 3.1-rc2, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 02/12] qemu-iotests: convert `pwd` and $(pwd) to $PWD, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 04/12] nbd: fix whitespace in server error message, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 06/12] io: return 0 for EOF in TLS session read after shutdown,
Eric Blake <=
- [Qemu-devel] [PULL 03/12] qemu-iotests: Modern shell scripting (use $() instead of ``), Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 05/12] nbd/server: Ignore write errors when replying to NBD_OPT_ABORT, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 09/12] tests: add iotests helpers for dealing with TLS certificates, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 08/12] tests: check if qemu-nbd is still alive before waiting, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 07/12] tests: pull qemu-nbd iotest helpers into common.nbd file, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 11/12] iotests: Also test I/O over NBD TLS, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 10/12] tests: exercise NBD server in TLS mode, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 12/12] iotests: Drop use of bash keyword 'function', Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 01/12] qemu-iotests: remove unused variable 'here', Eric Blake, 2018/11/19
- Re: [Qemu-devel] [PULL 00/12] NBD patches for 3.1-rc2, Peter Maydell, 2018/11/20