From owner-svn-src-head@freebsd.org  Mon Jul 30 10:23:30 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C8DC1051B1A;
 Mon, 30 Jul 2018 10:23:30 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id BDAD592025;
 Mon, 30 Jul 2018 10:23:29 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9CA432311A;
 Mon, 30 Jul 2018 10:23:29 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6UANTda054915;
 Mon, 30 Jul 2018 10:23:29 GMT (envelope-from rrs@FreeBSD.org)
Received: (from rrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6UANTbL054914;
 Mon, 30 Jul 2018 10:23:29 GMT (envelope-from rrs@FreeBSD.org)
Message-Id: <201807301023.w6UANTbL054914@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rrs set sender to rrs@FreeBSD.org
 using -f
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 30 Jul 2018 10:23:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336893 - head/sys/netinet/tcp_stacks
X-SVN-Group: head
X-SVN-Commit-Author: rrs
X-SVN-Commit-Paths: head/sys/netinet/tcp_stacks
X-SVN-Commit-Revision: 336893
X-SVN-Commit-Repository: base
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.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jul 2018 10:23:30 -0000

Author: rrs
Date: Mon Jul 30 10:23:29 2018
New Revision: 336893
URL: https://svnweb.freebsd.org/changeset/base/336893

Log:
  This fixes a hole where rack could end up
  sending an invalid segment into the reassembly
  queue. This would happen if you enabled the
  data after close option.
  
  Sponsored by:	Netflix
  Differential Revision: https://reviews.freebsd.org/D16453

Modified:
  head/sys/netinet/tcp_stacks/rack.c

Modified: head/sys/netinet/tcp_stacks/rack.c
==============================================================================
--- head/sys/netinet/tcp_stacks/rack.c	Mon Jul 30 09:50:26 2018	(r336892)
+++ head/sys/netinet/tcp_stacks/rack.c	Mon Jul 30 10:23:29 2018	(r336893)
@@ -4657,7 +4657,6 @@ rack_process_data(struct mbuf *m, struct tcphdr *th, s
 
 	rack = (struct tcp_rack *)tp->t_fb_ptr;
 	INP_WLOCK_ASSERT(tp->t_inpcb);
-
 	nsegs = max(1, m->m_pkthdr.lro_nsegs);
 	if ((thflags & TH_ACK) &&
 	    (SEQ_LT(tp->snd_wl1, th->th_seq) ||
@@ -4686,6 +4685,10 @@ rack_process_data(struct mbuf *m, struct tcphdr *th, s
 		tp->snd_nxt = tp->snd_max;
 		/* Make sure we output to start the timer */
 		rack->r_wanted_output++;
+	}
+	if (tp->t_flags2 & TF2_DROP_AF_DATA) {
+		m_freem(m);
+		return (0);
 	}
 	/*
 	 * Process segments with URG.