mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Add an underflow check to a cwnd error condition.

Browse source
This commit is contained in:
Mike Perry 2022-07-26 22:28:02 +00:00
parent 7654e12be8
commit 533fe36957
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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) { if (!cc->ewma_rtt_usec) {
uint64_t cwnd = cc->cwnd; uint64_t cwnd = cc->cwnd;
tor_assert_nonfatal(cc->cwnd <= cwnd_max);
/* If the channel is blocked, keep subtracting off the chan_q /* If the channel is blocked, keep subtracting off the chan_q
* until we hit the min cwnd. */ * until we hit the min cwnd. */
if (blocked_on_chan) { 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; cc->blocked_chan = 1;
} else { } else {
cc->blocked_chan = 0; cc->blocked_chan = 0;