Date: Mon, 20 Jun 2011 18:08:34 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/netinet tcp_input.c tcp_output.c tcp_timewait.c Message-ID: <201106201808.p5KI8ltB007472@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
jhb 2011-06-20 18:08:34 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_8)
sys/netinet tcp_input.c tcp_output.c tcp_timewait.c
Log:
SVN rev 223343 on 2011-06-20 18:08:34Z by jhb
MFC 221346,223049:
Handle a rare edge case with nearly full TCP receive buffers. If a TCP
buffer fills up causing the remote sender to enter into persist mode, but
there is still room available in the receive buffer when a window probe
arrives (either due to window scaling, or due to the local application
very slowing draining data from the receive buffer), then the single byte
of data in the window probe is accepted. However, this can cause rcv_nxt
to be greater than rcv_adv. This condition will only last until the next
ACK packet is pushed out via tcp_output(), and since the previous ACK
advertised a zero window, the ACK should be pushed out while the TCP
pcb is write-locked. To guarantee this, advance the advertised window
(rcv_adv) even if we advertise a zero window.
During the window while rcv_nxt is greather than rcv_adv, a few places
would compute the remaining receive window via rcv_adv - rcv_nxt.
However, this value was then (uint32_t)-1. On a 64 bit machine this
could expand to a positive 2^32 - 1 when cast to a long. In particular,
when calculating the receive window in tcp_output(), the result would be
that the receive window was computed as 2^32 - 1 resulting in advertising
a far larger window to the remote peer than actually existed.
Fix various places that compute the remaining receive window to either
assert that it is not negative (i.e. rcv_nxt <= rcv_adv), or treat the
window as full if rcv_nxt is greather than rcv_adv.
Revision Changes Path
1.411.2.17 +7 -1 src/sys/netinet/tcp_input.c
1.164.2.13 +13 -6 src/sys/netinet/tcp_output.c
1.307.2.6 +3 -0 src/sys/netinet/tcp_timewait.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106201808.p5KI8ltB007472>