mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-03 17:13:33 +01:00
Merge branch 'maint-0.2.6' into release-0.2.6
This commit is contained in:
commit
2b34b2323a
7
changes/trove-2017-005
Normal file
7
changes/trove-2017-005
Normal file
@ -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.
|
||||||
|
|
||||||
|
|
@ -1500,7 +1500,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
|
|||||||
"Begin cell for known stream. Dropping.");
|
"Begin cell for known stream. Dropping.");
|
||||||
return 0;
|
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,
|
/* Assign this circuit and its app-ward OR connection a unique ID,
|
||||||
* so that we can measure download times. The local edge and dir
|
* so that we can measure download times. The local edge and dir
|
||||||
* connection will be assigned the same ID when they are created
|
* connection will be assigned the same ID when they are created
|
||||||
|
Loading…
Reference in New Issue
Block a user