From owner-svn-src-head@freebsd.org  Fri Jul 17 17:36:34 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 4FA5F9A4D8B;
 Fri, 17 Jul 2015 17:36:34 +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 382DC11C6;
 Fri, 17 Jul 2015 17:36:34 +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 t6HHaYS9098297;
 Fri, 17 Jul 2015 17:36:34 GMT (envelope-from pkelsey@FreeBSD.org)
Received: (from pkelsey@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6HHaYWo098296;
 Fri, 17 Jul 2015 17:36:34 GMT (envelope-from pkelsey@FreeBSD.org)
Message-Id: <201507171736.t6HHaYWo098296@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: Fri, 17 Jul 2015 17:36:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285657 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jul 2015 17:36:34 -0000

Author: pkelsey
Date: Fri Jul 17 17:36:33 2015
New Revision: 285657
URL: https://svnweb.freebsd.org/changeset/base/285657

Log:
  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.
  
  Differential Revision: https://reviews.freebsd.org/D3060
  Reviewed by:	hiren
  Approved by:	jmallett (mentor)
  MFC after:	3 days
  Sponsored by:	Norse Corp, Inc.

Modified:
  head/sys/netinet/tcp_input.c

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Fri Jul 17 16:34:01 2015	(r285656)
+++ head/sys/netinet/tcp_input.c	Fri Jul 17 17:36:33 2015	(r285657)
@@ -1856,6 +1856,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) &&