torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wipe address strings from connections before freeing them them.

Browse Source 
This is a defense-in-depth fix; closes 6198.
This commit is contained in:
Nick Mathewson
2020-08-03 10:15:08 -04:00
parent 5b9508c9a5
commit ea876ab00e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/ticket6198
+3
View File
@@ -0,0 +1,3 @@
o Minor features (defense in depth):
- Wipe more data from connection address fields before returning them to
the memory heap. Closes ticket 6198.
src/core/mainloop/connection.c
+4 -4
View File
@@ -637,7 +637,7 @@ connection_free_minimal(connection_t *conn)
}
}
tor_free(conn->address);
tor_str_wipe_and_free(conn->address);
if (connection_speaks_cells(conn)) {
or_connection_t *or_conn = TO_OR_CONN(conn);
@@ -657,7 +657,7 @@ connection_free_minimal(connection_t *conn)
}
or_handshake_state_free(or_conn->handshake_state);
or_conn->handshake_state = NULL;
tor_free(or_conn->nickname);
tor_str_wipe_and_free(or_conn->nickname);
if (or_conn->chan) {
/* Owww, this shouldn't happen, but... */
channel_t *base_chan = TLS_CHAN_TO_BASE(or_conn->chan);
@@ -677,8 +677,8 @@ connection_free_minimal(connection_t *conn)
}
if (conn->type == CONN_TYPE_AP) {
entry_connection_t *entry_conn = TO_ENTRY_CONN(conn);
tor_free(entry_conn->chosen_exit_name);
tor_free(entry_conn->original_dest_address);
tor_str_wipe_and_free(entry_conn->chosen_exit_name);
tor_str_wipe_and_free(entry_conn->original_dest_address);
if (entry_conn->socks_request)
socks_request_free(entry_conn->socks_request);
if (entry_conn->pending_optimistic_data) {