nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid double-close on TCP sockets under NSS."

Browse Source 
This reverts commit b5fddbd241.

The commit here was supposed to be a solution for #27451 (fd
management with NSS), but instead it caused an assertion failure.

Fixes bug 27500; but not in any released Tor.
This commit is contained in:
Nick Mathewson 2018-09-06 10:53:29 -04:00
parent 8815960c46
commit 22e2403145
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/mainloop/connection.c
View File

@ -449,20 +449,6 @@ connection_new(int type, int socket_family)
} }
} }
static void
connection_close_and_invalidate_socket(connection_t *conn)
{
if (connection_speaks_cells(conn)) {
or_connection_t *or_conn = TO_OR_CONN(conn);
tor_tls_free(or_conn->tls);
or_conn->tls = NULL;
or_conn->base_.s = TOR_INVALID_SOCKET;
} else {
tor_close_socket(conn->s);
conn->s = TOR_INVALID_SOCKET;
}
}
/** Initializes conn. (you must call connection_add() to link it into the main /** Initializes conn. (you must call connection_add() to link it into the main
* array). * array).
* *
@ -628,8 +614,9 @@ connection_free_minimal(connection_t *conn)
tor_free(conn->address); tor_free(conn->address);
if (connection_speaks_cells(conn)) { if (connection_speaks_cells(conn)) {
connection_close_and_invalidate_socket(conn);
or_connection_t *or_conn = TO_OR_CONN(conn); or_connection_t *or_conn = TO_OR_CONN(conn);
tor_tls_free(or_conn->tls);
or_conn->tls = NULL;
or_handshake_state_free(or_conn->handshake_state); or_handshake_state_free(or_conn->handshake_state);
or_conn->handshake_state = NULL; or_conn->handshake_state = NULL;
tor_free(or_conn->nickname); tor_free(or_conn->nickname);
@ -705,7 +692,9 @@ connection_free_minimal(connection_t *conn)
} }
if (SOCKET_OK(conn->s)) { if (SOCKET_OK(conn->s)) {
connection_close_and_invalidate_socket(conn); log_debug(LD_NET,"closing fd %d.",(int)conn->s);
tor_close_socket(conn->s);
conn->s = TOR_INVALID_SOCKET;
} }
if (conn->type == CONN_TYPE_OR && if (conn->type == CONN_TYPE_OR &&
@ -831,7 +820,9 @@ connection_close_immediate(connection_t *conn)
conn->read_blocked_on_bw = 0; conn->read_blocked_on_bw = 0;
conn->write_blocked_on_bw = 0; conn->write_blocked_on_bw = 0;
connection_close_and_invalidate_socket(conn); if (SOCKET_OK(conn->s))
tor_close_socket(conn->s);
conn->s = TOR_INVALID_SOCKET;
if (conn->linked) if (conn->linked)
conn->linked_conn_is_closed = 1; conn->linked_conn_is_closed = 1;
if (conn->outbuf) if (conn->outbuf)

2
src/lib/tls/tortls_openssl.c
View File

@ -1042,7 +1042,7 @@ tor_tls_new(tor_socket_t sock, int isServer)
goto err; goto err;
} }
result->socket = sock; result->socket = sock;
bio = BIO_new_socket(sock, 0); bio = BIO_new_socket(sock, BIO_NOCLOSE);
if (! bio) { if (! bio) {
tls_log_errors(NULL, LOG_WARN, LD_NET, "opening BIO"); tls_log_errors(NULL, LOG_WARN, LD_NET, "opening BIO");
#ifdef SSL_set_tlsext_host_name #ifdef SSL_set_tlsext_host_name