nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.5' into maint-0.4.6

Browse Source
This commit is contained in:
David Goulet 2022-07-27 11:33:19 -04:00
commit e618a7e445
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug40645 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (defense in depth):
- Change a test in the netflow padding code to make it more
_obviously_ safe against remotely triggered crashes.
(It was safe against these before, but not obviously so.)
Fixes bug 40645; bugfix on 0.3.1.1-alpha.

2
src/core/or/channelpadding.c
View File

@ -186,7 +186,7 @@ channelpadding_get_netflow_inactive_timeout_ms(const channel_t *chan)
high_timeout = MAX(high_timeout, chan->padding_timeout_high_ms); high_timeout = MAX(high_timeout, chan->padding_timeout_high_ms);
} }
if (low_timeout == high_timeout) if (low_timeout >= high_timeout)
return low_timeout; // No randomization return low_timeout; // No randomization
/* /*

2
src/core/or/command.c
View File

@ -664,7 +664,7 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan)
* DESTROY cell down the circuit so relays can stop queuing in-flight * DESTROY cell down the circuit so relays can stop queuing in-flight
* cells for this circuit which helps with memory pressure. */ * cells for this circuit which helps with memory pressure. */
log_debug(LD_OR, "Received DESTROY cell from n_chan, closing circuit."); log_debug(LD_OR, "Received DESTROY cell from n_chan, closing circuit.");
circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL); circuit_mark_for_close(circ, reason | END_CIRC_REASON_FLAG_REMOTE);
} }
} }
} }