diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-17 13:56:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-17 13:56:10 -0400 |
| commit | d4595b344a1a32547c8578e1d62cee0beb63dc78 (patch) | |
| tree | 27e51fffb8705edcc253c0ef37eef4d3a9da6156 | |
| parent | d3c4ed08f16a35075a43ba7e731552ffbea3cecc (diff) | |
| parent | 6803373aab2292fe7286d1e19e25d5016b6ac9b8 (diff) | |
| download | tor-d4595b344a1a32547c8578e1d62cee0beb63dc78.tar.gz tor-d4595b344a1a32547c8578e1d62cee0beb63dc78.zip | |
Merge branch 'maint-0.4.3'
| -rw-r--r-- | changes/ticket33619 | 5 | ||||
| -rw-r--r-- | src/core/or/circuitpadding.c | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/changes/ticket33619 b/changes/ticket33619 new file mode 100644 index 0000000000..3c52858b35 --- /dev/null +++ b/changes/ticket33619 @@ -0,0 +1,5 @@ + o Major bugfixes (circuit padding, memory leaks): + - Avoid a remotely triggered memory leak in the case that a circuit + padding machine is somehow negotiated twice on the same circuit. Fixes + bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls. This is + also tracked as TROVE-2020-004. diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 3853e9fdc4..43f4a31624 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -2446,9 +2446,12 @@ circpad_setup_machine_on_circ(circuit_t *on_circ, return; } - tor_assert_nonfatal(on_circ->padding_machine[machine->machine_index] - == NULL); - tor_assert_nonfatal(on_circ->padding_info[machine->machine_index] == NULL); + IF_BUG_ONCE(on_circ->padding_machine[machine->machine_index] != NULL) { + return; + } + IF_BUG_ONCE(on_circ->padding_info[machine->machine_index] != NULL) { + return; + } /* Log message */ if (CIRCUIT_IS_ORIGIN(on_circ)) { |