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

Merge branch 'maint-0.3.0'

Browse Source
This commit is contained in:
Nick Mathewson 2017-03-04 20:24:02 -05:00
commit 3a1cba7d90
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug21576 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (crash, directory connections):
- Fix a rare crash when sending a begin cell on a circuit whose linked
directory connection has already been closed. Fixes bug 21576;
bugfix on Tor 0.2.9.3-alpha. Reported by alecmuffett.

12
src/or/connection_edge.c
View File

@ -2514,10 +2514,16 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn)
} else if (begin_type == RELAY_COMMAND_BEGIN_DIR) { } else if (begin_type == RELAY_COMMAND_BEGIN_DIR) {
/* This connection is a begindir directory connection. /* This connection is a begindir directory connection.
* Look at the linked directory connection to access the directory purpose. * Look at the linked directory connection to access the directory purpose.
* (This must be non-NULL, because we're doing begindir.) */ * If a BEGINDIR connection is ever not linked, that's a bug. */
tor_assert(base_conn->linked); if (BUG(!base_conn->linked)) {
return -1;
}
connection_t *linked_dir_conn_base = base_conn->linked_conn; connection_t *linked_dir_conn_base = base_conn->linked_conn;
tor_assert(linked_dir_conn_base); /* If the linked connection has been unlinked by other code, we can't send
* a begin cell on it. */
if (!linked_dir_conn_base) {
return -1;
}
/* Sensitive directory connections must have an anonymous path length. /* Sensitive directory connections must have an anonymous path length.
* Otherwise, directory connections are typically one-hop. * Otherwise, directory connections are typically one-hop.
* This matches the earlier check for directory connection path anonymity * This matches the earlier check for directory connection path anonymity