diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 09:21:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 09:21:15 -0400 |
| commit | 2b34b2323aa9b7ca30c5f70b39c59145296f9f08 (patch) | |
| tree | b2303d344abf593d90d8ba12f0ed58d259be9529 | |
| parent | 48bd65921466d73ae4178151fe7a671e60c9bfd8 (diff) | |
| parent | 40bccc20042fcc4f43964b358257470830169e73 (diff) | |
| download | tor-2b34b2323aa9b7ca30c5f70b39c59145296f9f08.tar.gz tor-2b34b2323aa9b7ca30c5f70b39c59145296f9f08.zip | |
Merge branch 'maint-0.2.6' into release-0.2.6
| -rw-r--r-- | changes/trove-2017-005 | 7 | ||||
| -rw-r--r-- | src/or/relay.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/trove-2017-005 b/changes/trove-2017-005 new file mode 100644 index 0000000000..cebb013f86 --- /dev/null +++ b/changes/trove-2017-005 @@ -0,0 +1,7 @@ + o Major bugfixes (hidden service, relay, security): + - Fix an assertion failure caused by receiving a BEGIN_DIR cell on + a hidden service rendezvous circuit. Fixes bug 22494, tracked as + TROVE-2017-005 and CVE-2017-0376; bugfix on 0.2.2.1-alpha. Found + by armadev. + + diff --git a/src/or/relay.c b/src/or/relay.c index 50eaab83c8..bbb5f27c93 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1500,7 +1500,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "Begin cell for known stream. Dropping."); return 0; } - if (rh.command == RELAY_COMMAND_BEGIN_DIR) { + if (rh.command == RELAY_COMMAND_BEGIN_DIR && + circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) { /* Assign this circuit and its app-ward OR connection a unique ID, * so that we can measure download times. The local edge and dir * connection will be assigned the same ID when they are created |