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 'maint-0.4.7'

Browse Source
This commit is contained in:
David Goulet 2022-08-02 15:31:00 -04:00
commit f51c68729f
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug40644 Normal file
View File

@ -0,0 +1,8 @@
o Minor bugfixes (congestion control):
- Add a check for an integer underflow condition that might
happen in cases where the system clock is stopped, the
ORconn is blocked, and the endpoint sends more than a
congestion window worth of non-data control cells at once.
This would cause a large congestion window to be calculated
instead of a small one. No security impact. Fixes bug 40644;
bugfix on 0.4.7.5-alpha.

11
src/core/or/congestion_control_common.c
View File

@ -882,10 +882,19 @@ congestion_control_update_circuit_bdp(congestion_control_t *cc,
if (!cc->ewma_rtt_usec) {
uint64_t cwnd = cc->cwnd;
tor_assert_nonfatal(cc->cwnd <= cwnd_max);
/* If the channel is blocked, keep subtracting off the chan_q
* until we hit the min cwnd. */
if (blocked_on_chan) {
cwnd = MAX(cwnd - chan_q, cc->cwnd_min);
/* Cast is fine because we're less than int32 */
if (chan_q >= (int64_t)cwnd) {
log_notice(LD_CIRC,
"Clock stall with large chanq: %d %"PRIu64, chan_q, cwnd);
cwnd = cc->cwnd_min;
} else {
cwnd = MAX(cwnd - chan_q, cc->cwnd_min);
}
cc->blocked_chan = 1;
} else {
cc->blocked_chan = 0;