From owner-svn-src-stable@freebsd.org  Tue Jul 21 18:38:32 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5FAF9A7087;
 Tue, 21 Jul 2015 18:38:32 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BE09711CA;
 Tue, 21 Jul 2015 18:38:32 +0000 (UTC)
 (envelope-from pkelsey@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6LIcWR5093343;
 Tue, 21 Jul 2015 18:38:32 GMT (envelope-from pkelsey@FreeBSD.org)
Received: (from pkelsey@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6LIcW86093342;
 Tue, 21 Jul 2015 18:38:32 GMT (envelope-from pkelsey@FreeBSD.org)
Message-Id: <201507211838.t6LIcW86093342@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pkelsey set sender to
 pkelsey@FreeBSD.org using -f
From: Patrick Kelsey <pkelsey@FreeBSD.org>
Date: Tue, 21 Jul 2015 18:38:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r285762 - stable/10/sys/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jul 2015 18:38:32 -0000

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) &&