svn commit: r285762 - stable/10/sys/netinet

[Patrick Kelsey]

Author: pkelsey
Date: Tue Jul 21 18:38:31 2015
New Revision: 285762
URL: https://svnweb.freebsd.org/changeset/base/285762

Log:
  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)

Modified:
  stable/10/sys/netinet/tcp_input.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/tcp_input.c
==============================================================================
--- stable/10/sys/netinet/tcp_input.c	Tue Jul 21 18:08:10 2015	(r285761)
+++ stable/10/sys/netinet/tcp_input.c	Tue Jul 21 18:38:31 2015	(r285762)
@@ -1801,6 +1801,7 @@ tcp_do_segment(struct mbuf *m, struct tc
 		 * 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) &&