diff options
| author | pkelsey <pkelsey@FreeBSD.org> | 2015-07-21 18:38:31 +0000 |
|---|---|---|
| committer | pkelsey <pkelsey@FreeBSD.org> | 2015-07-21 18:38:31 +0000 |
| commit | 04fd70b7f27ee67ca987564f0b1be9067c7c2b23 (patch) | |
| tree | 3618342ce8eeeea50b33d1df63b4dc99bd380a76 /sys/netinet | |
| parent | 84c91edd5356f5693f0ecd74d787e98b52fee0b4 (diff) | |
| download | FreeBSD-src-04fd70b7f27ee67ca987564f0b1be9067c7c2b23.zip FreeBSD-src-04fd70b7f27ee67ca987564f0b1be9067c7c2b23.tar.gz | |
MFC r285567:
Check TCP timestamp option flag so that the automatic receive buffer
scaling code does not use an uninitialized timestamp echo reply value
from the stack when timestamps are not enabled.
Approved by: re (gjb)
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 7918252..6af5c9c 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1801,6 +1801,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, * the buffer to better manage the socket buffer resources. */ if (V_tcp_do_autorcvbuf && + (to.to_flags & TOF_TS) && to.to_tsecr && (so->so_rcv.sb_flags & SB_AUTOSIZE)) { if (TSTMP_GT(to.to_tsecr, tp->rfbuf_ts) && |
