diff options
| author | Andrea Shepard <andrea@torproject.org> | 2013-06-15 02:20:19 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2013-06-15 02:20:19 -0700 |
| commit | 9e45d940d466bcefcd1490fc2ae0e5a6298a846f (patch) | |
| tree | ef88a6cdd3e444a19bbeeeb80c1741593a5239a5 | |
| parent | 8b6d0bd99cf233560f7e704a35e4f64a5271bfb1 (diff) | |
| parent | 2a95f3171681ee53c97ccba9d80f4454b462aaa7 (diff) | |
| download | tor-9e45d940d466bcefcd1490fc2ae0e5a6298a846f.tar.gz tor-9e45d940d466bcefcd1490fc2ae0e5a6298a846f.zip | |
Merge branch 'bug9072-023' into bug9072-024
| -rw-r--r-- | changes/bug9072 | 3 | ||||
| -rw-r--r-- | src/or/relay.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug9072 b/changes/bug9072 new file mode 100644 index 0000000000..e594a38335 --- /dev/null +++ b/changes/bug9072 @@ -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. diff --git a/src/or/relay.c b/src/or/relay.c index a26d4186d0..0f21663bcd 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2482,6 +2482,10 @@ append_cell_to_circuit_queue(circuit_t *circ, channel_t *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? */ if ((circ->n_chan != NULL) && CIRCUIT_IS_ORCIRC(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); |