moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

url: close TLS before removing conn from cache

Browse Source 
- Fix potential crashes in schannel shutdown.

Ensure any TLS shutdown messages are sent before removing the
association between the connection and the easy handle. Reverts
@bagder's previous partial fix for #3412.

Fixes https://github.com/curl/curl/issues/3412
Fixes https://github.com/curl/curl/issues/3505
Closes https://github.com/curl/curl/pull/3531
This commit is contained in:
Chris Araman 2019-02-05 21:56:36 -08:00 committed by Jay Satiro
parent fef38a0898
commit 927a5bd1b4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/url.c
View File

@ -788,8 +788,11 @@ CURLcode Curl_disconnect(struct Curl_easy *data,
/* This is set if protocol-specific cleanups should be made */ /* This is set if protocol-specific cleanups should be made */
conn->handler->disconnect(conn, dead_connection); conn->handler->disconnect(conn, dead_connection);
/* unlink ourselves! */
infof(data, "Closing connection %ld\n", conn->connection_id); infof(data, "Closing connection %ld\n", conn->connection_id);
Curl_ssl_close(conn, FIRSTSOCKET);
Curl_ssl_close(conn, SECONDARYSOCKET);
/* unlink ourselves! */
Curl_conncache_remove_conn(data, conn, TRUE); Curl_conncache_remove_conn(data, conn, TRUE);
free_idnconverted_hostname(&conn->host); free_idnconverted_hostname(&conn->host);
@ -797,10 +800,6 @@ CURLcode Curl_disconnect(struct Curl_easy *data,
free_idnconverted_hostname(&conn->http_proxy.host); free_idnconverted_hostname(&conn->http_proxy.host);
free_idnconverted_hostname(&conn->socks_proxy.host); free_idnconverted_hostname(&conn->socks_proxy.host);
/* this assumes that the pointer is still there after the connection was
detected from the cache */
Curl_ssl_close(conn, FIRSTSOCKET);
conn_free(conn); conn_free(conn);
return CURLE_OK; return CURLE_OK;
} }

8
lib/vtls/schannel.c
View File

@ -1960,6 +1960,8 @@ static int Curl_schannel_shutdown(struct connectdata *conn, int sockindex)
char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name :
conn->host.name; conn->host.name;
DEBUGASSERT(data);
infof(data, "schannel: shutting down SSL/TLS connection with %s port %hu\n", infof(data, "schannel: shutting down SSL/TLS connection with %s port %hu\n",
hostname, conn->remote_port); hostname, conn->remote_port);
@ -2035,11 +2037,9 @@ static int Curl_schannel_shutdown(struct connectdata *conn, int sockindex)
* might not have an associated transfer so the check for conn->data is * might not have an associated transfer so the check for conn->data is
* necessary. * necessary.
*/ */
if(conn->data) Curl_ssl_sessionid_lock(conn);
Curl_ssl_sessionid_lock(conn);
Curl_schannel_session_free(BACKEND->cred); Curl_schannel_session_free(BACKEND->cred);
if(conn->data) Curl_ssl_sessionid_unlock(conn);
Curl_ssl_sessionid_unlock(conn);
BACKEND->cred = NULL; BACKEND->cred = NULL;
} }