1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Schannel: Return if socket is invalid

Browse Source 
In a couple places we already check if the socket is connected,
however we can be connected _and_ have the socket be closed.
The logic behind that I don't really understand, but there are
similar checks for validity in the OpenSSL backend.

This happens when calling close() on a still-connecting
socket. The QIODevice is marked as closed, but the connection
cannot yet be aborted. And when it finishes connecting we
handle the signal, start encryption, and then disconnect.

Pick-to: 6.5
Fixes: QTBUG-116550
Change-Id: I06c0a2db32bea0b573a99a971b8fb0b66a7a73d5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 3ea46fa978eeb1e8fbcbd20f1dc88690a25dbe63)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2023-10-20 17:54:02 +02:00 committed by Qt Cherry-pick Bot
parent 80b9714d7e
commit 1b62cee8d5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/tls/schannel/qtls_schannel.cpp
View File

@ -720,6 +720,8 @@ bool TlsCryptographSchannel::sendToken(void *token, unsigned long tokenLength, b
Q_ASSERT(d); Q_ASSERT(d);
auto *plainSocket = d->plainTcpSocket(); auto *plainSocket = d->plainTcpSocket();
Q_ASSERT(plainSocket); Q_ASSERT(plainSocket);
if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid())
return false;
const qint64 written = plainSocket->write(static_cast<const char *>(token), tokenLength); const qint64 written = plainSocket->write(static_cast<const char *>(token), tokenLength);
if (written != qint64(tokenLength)) { if (written != qint64(tokenLength)) {
@ -1076,7 +1078,7 @@ bool TlsCryptographSchannel::performHandshake()
auto *plainSocket = d->plainTcpSocket(); auto *plainSocket = d->plainTcpSocket();
Q_ASSERT(plainSocket); Q_ASSERT(plainSocket);
if (plainSocket->state() == QAbstractSocket::UnconnectedState) { if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid()) {
setErrorAndEmit(d, QAbstractSocket::RemoteHostClosedError, setErrorAndEmit(d, QAbstractSocket::RemoteHostClosedError,
QSslSocket::tr("The TLS/SSL connection has been closed")); QSslSocket::tr("The TLS/SSL connection has been closed"));
return false; return false;
@ -1446,7 +1448,7 @@ void TlsCryptographSchannel::transmit()
return; // This function should not have been called return; // This function should not have been called
// Can happen if called through QSslSocket::abort->QSslSocket::close->QSslSocket::flush->here // Can happen if called through QSslSocket::abort->QSslSocket::close->QSslSocket::flush->here
if (plainSocket->state() == QAbstractSocket::SocketState::UnconnectedState) if (plainSocket->state() == QAbstractSocket::UnconnectedState || !plainSocket->isValid())
return; return;
if (schannelState != SchannelState::Done) { if (schannelState != SchannelState::Done) {