svn commit: r347153 - stable/11/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun May  5 12:11:58 2019
New Revision: 347153
URL: https://svnweb.freebsd.org/changeset/base/347153

Log:
  MFC r335194:
  When retransmitting TCP SYN-ACK segments with the TCP timestamp option
  enabled use an updated timestamp instead of reusing the one used in
  the initial TCP SYN-ACK segment.
  
  This patch ensures that an updated timestamp is used when sending the
  SYN-ACK from the syncache code. It was already done if the
  SYN-ACK was retransmitted from the generic code.
  
  This makes the behaviour consistent and also conformant with
  the TCP specification.
  
  Reviewed by:		jtl@, Jason Eggleston
  Sponsored by:		Netflix, Inc.
  Differential Revision:	https://reviews.freebsd.org/D15634

Modified:
  stable/11/sys/netinet/tcp_syncache.c
  stable/11/sys/netinet/tcp_syncache.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/tcp_syncache.c
==============================================================================
--- stable/11/sys/netinet/tcp_syncache.c	Sun May  5 11:35:38 2019	(r347152)
+++ stable/11/sys/netinet/tcp_syncache.c	Sun May  5 12:11:58 2019	(r347153)
@@ -1158,25 +1158,6 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt
 		}
 	}
 
-	/*
-	 * If timestamps were negotiated, the reflected timestamp
-	 * must be equal to what we actually sent in the SYN|ACK
-	 * except in the case of 0. Some boxes are known for sending
-	 * broken timestamp replies during the 3whs (and potentially
-	 * during the connection also).
-	 *
-	 * Accept the final ACK of 3whs with reflected timestamp of 0
-	 * instead of sending a RST and deleting the syncache entry.
-	 */
-	if ((to->to_flags & TOF_TS) && to->to_tsecr &&
-	    to->to_tsecr != sc->sc_ts) {
-		if ((s = tcp_log_addrs(inc, th, NULL, NULL)))
-			log(LOG_DEBUG, "%s; %s: TSECR %u != TS %u, "
-			    "segment rejected\n",
-			    s, __func__, to->to_tsecr, sc->sc_ts);
-		goto failed;
-	}
-
 	*lsop = syncache_socket(sc, *lsop, m);
 
 	if (*lsop == NULL)
@@ -1510,7 +1491,6 @@ skip_alloc:
 		 */
 		if (to->to_flags & TOF_TS) {
 			sc->sc_tsreflect = to->to_tsval;
-			sc->sc_ts = tcp_ts_getticks();
 			sc->sc_flags |= SCF_TIMESTAMP;
 		}
 		if (to->to_flags & TOF_SCALE) {
@@ -1734,8 +1714,7 @@ syncache_respond(struct syncache *sc, struct syncache_
 			to.to_flags |= TOF_SCALE;
 		}
 		if (sc->sc_flags & SCF_TIMESTAMP) {
-			/* Virgin timestamp or TCP cookie enhanced one. */
-			to.to_tsval = sc->sc_ts;
+			to.to_tsval = sc->sc_tsoff + tcp_ts_getticks();
 			to.to_tsecr = sc->sc_tsreflect;
 			to.to_flags |= TOF_TS;
 		}
@@ -2044,8 +2023,7 @@ syncookie_generate(struct syncache_head *sch, struct s
 
 	/* Randomize the timestamp. */
 	if (sc->sc_flags & SCF_TIMESTAMP) {
-		sc->sc_ts = arc4random();
-		sc->sc_tsoff = sc->sc_ts - tcp_ts_getticks();
+		sc->sc_tsoff = arc4random() - tcp_ts_getticks();
 	}
 
 	TCPSTAT_INC(tcps_sc_sendcookie);
@@ -2134,7 +2112,6 @@ syncookie_lookup(struct in_conninfo *inc, struct synca
 	if (to->to_flags & TOF_TS) {
 		sc->sc_flags |= SCF_TIMESTAMP;
 		sc->sc_tsreflect = to->to_tsval;
-		sc->sc_ts = to->to_tsecr;
 		sc->sc_tsoff = to->to_tsecr - tcp_ts_getticks();
 	}
 

Modified: stable/11/sys/netinet/tcp_syncache.h
==============================================================================
--- stable/11/sys/netinet/tcp_syncache.h	Sun May  5 11:35:38 2019	(r347152)
+++ stable/11/sys/netinet/tcp_syncache.h	Sun May  5 12:11:58 2019	(r347153)
@@ -54,7 +54,6 @@ struct syncache {
 	int		sc_rxttime;		/* retransmit time */
 	u_int16_t	sc_rxmits;		/* retransmit counter */
 	u_int32_t	sc_tsreflect;		/* timestamp to reflect */
-	u_int32_t	sc_ts;			/* our timestamp to send */
 	u_int32_t	sc_tsoff;		/* ts offset w/ syncookies */
 	u_int32_t	sc_flowlabel;		/* IPv6 flowlabel */
 	tcp_seq		sc_irs;			/* seq from peer */