nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug9072-023' into bug9072-024

Browse Source
This commit is contained in:
Andrea Shepard 2013-06-15 02:20:19 -07:00
commit 9e45d940d4
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug9072 Normal file
View File

@ -0,0 +1,3 @@
o Critical bugfixes:
- Disable middle relay queue overfill detection code due to possible
guard discovery attack, pending further analysis. Fixes bug #9072.

5
src/or/relay.c
View File

@ -2482,6 +2482,10 @@ append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan,
streams_blocked = circ->streams_blocked_on_p_chan; streams_blocked = circ->streams_blocked_on_p_chan;
} }
/*
* Disabling this for now because of a possible guard discovery attack
*/
#if 0
/* Are we a middle circuit about to exceed ORCIRC_MAX_MIDDLE_CELLS? */ /* Are we a middle circuit about to exceed ORCIRC_MAX_MIDDLE_CELLS? */
if ((circ->n_chan != NULL) && CIRCUIT_IS_ORCIRC(circ)) { if ((circ->n_chan != NULL) && CIRCUIT_IS_ORCIRC(circ)) {
orcirc = TO_OR_CIRCUIT(circ); orcirc = TO_OR_CIRCUIT(circ);
@ -2505,6 +2509,7 @@ append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan,
} }
} }
} }
#endif
cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids); cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids);