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 | cdb58af90d26452be60781355fbf40f7328735bd (patch) | |
| tree | ab6f38c4cde8dcfa3cb916f7d5deb16a8afe7d97 | |
| parent | 98f610068f669cabbd2fde764c79e8c9d0481976 (diff) | |
| parent | 56a7c5bc15e0447203a491c1ee37de9939ad1dcd (diff) | |
| download | tor-cdb58af90d26452be60781355fbf40f7328735bd.tar.gz tor-cdb58af90d26452be60781355fbf40f7328735bd.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
| -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 7f06c6e145..59b79f95c9 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1297,7 +1297,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 |