Merge branch 'maint-0.3.2' into release-0.3.2
This commit is contained in:
commit
4fc402496e
|
@ -0,0 +1,5 @@
|
||||||
|
o Minor bugfixes (scheduler, KIST):
|
||||||
|
- Avoid a possible integer overflow when computing the available space on
|
||||||
|
the TCP buffer of a channel. This has no security implications but can
|
||||||
|
make KIST not behave properly by allowing more cells on a already
|
||||||
|
saturated connection. Fixes bug 24590; bugfix on 0.3.2.1-alpha.
|
|
@ -264,10 +264,13 @@ update_socket_info_impl, (socket_table_ent_t *ent))
|
||||||
* ^ ((cwnd * mss) * factor) bytes
|
* ^ ((cwnd * mss) * factor) bytes
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Assuming all these values from the kernel are uint32_t still, they will
|
/* These values from the kernel are uint32_t, they will always fit into a
|
||||||
* always fit into a int64_t tcp_space variable. */
|
* int64_t tcp_space variable but if the congestion window cwnd is smaller
|
||||||
tcp_space = (ent->cwnd - ent->unacked) * (int64_t)ent->mss;
|
* than the unacked packets, the remaining TCP space is set to 0 so we don't
|
||||||
if (tcp_space < 0) {
|
* write more on this channel. */
|
||||||
|
if (ent->cwnd >= ent->unacked) {
|
||||||
|
tcp_space = (ent->cwnd - ent->unacked) * (int64_t)(ent->mss);
|
||||||
|
} else {
|
||||||
tcp_space = 0;
|
tcp_space = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue