diff options
| author | David Goulet <dgoulet@torproject.org> | 2024-04-15 14:24:45 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2024-04-15 14:24:45 -0400 |
| commit | 269b4561a17698732c6402e2b7a8aeb1f8e3c3bf (patch) | |
| tree | d459664432fa0538eb4b7b3405d312b9e742cc30 /changes | |
| parent | 6ebf4360840b173b92fcdb14ce22bd326cea652f (diff) | |
| download | tor-269b4561a17698732c6402e2b7a8aeb1f8e3c3bf.tar.gz tor-269b4561a17698732c6402e2b7a8aeb1f8e3c3bf.zip | |
conflux: Avoid noting a cell was sent on a closed circuit
It turns out that circuit_package_relay_cell() returns 0 in order to drop a
cell but there is a code path, if the circuit queue is full, that also silently
closes the circuit and returns 0.
This lead to Conflux thinking a cell was sent but actually the cell was not and
the circuit was closed leading to the hard assert.
And so this function makes sure that circuit_package_relay_cell() and
append_cell_to_circuit_queue() returns a value that indicate what happened with
the cell and circuit so the caller can make an informed decision with it.
This change makes it that we do NOT enter the Conflux subsystem if the cell is
not queued on the circuit.
Fixes #40921
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/ticket40921 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/ticket40921 b/changes/ticket40921 new file mode 100644 index 0000000000..5818b91864 --- /dev/null +++ b/changes/ticket40921 @@ -0,0 +1,3 @@ + o Minor bugfixes (conflux): + - Avoid a potential hard assert (crash) when sending a cell on a Conflux + set. Fixes bug 40921; bugfix on 0.4.8.1-alpha. |