svn commit: r271668 - in stable: 8/sys/netinet 9/sys/netinet

[Xin LI]

Author: delphij
Date: Tue Sep 16 09:49:11 2014
New Revision: 271668
URL: http://svnweb.freebsd.org/changeset/base/271668

Log:
  Fix Denial of Service in TCP packet processing.
  
  Security:	FreeBSD-SA-14:19.tcp

Modified:
  stable/8/sys/netinet/tcp_input.c

Changes in other areas also in this revision:
Modified:
  stable/9/sys/netinet/tcp_input.c

Modified: stable/8/sys/netinet/tcp_input.c
==============================================================================
--- stable/8/sys/netinet/tcp_input.c	Tue Sep 16 09:48:35 2014	(r271667)
+++ stable/8/sys/netinet/tcp_input.c	Tue Sep 16 09:49:11 2014	(r271668)
@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tc
 
 	todrop = tp->rcv_nxt - th->th_seq;
 	if (todrop > 0) {
-		/*
-		 * If this is a duplicate SYN for our current connection,
-		 * advance over it and pretend and it's not a SYN.
-		 */
-		if (thflags & TH_SYN && th->th_seq == tp->irs) {
+		if (thflags & TH_SYN) {
 			thflags &= ~TH_SYN;
 			th->th_seq++;
 			if (th->th_urp > 1)