---

yaml --- r: 225189 b: refs/heads/master c: bc2ce89 h: refs/heads/master i: 225187: 290c347 v: v3
git-mirror · Dec 16, 2010 · 480c6f2 · 480c6f2
1 parent e128927
commit 480c6f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 443457242beb6716b43db4d62fe148eab5515505
+refs/heads/master: bc2ce894e113ed95b92541134b002fdc641e8080
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
@@ -1038,7 +1038,13 @@ static inline int tcp_paws_check(const struct tcp_options_received *rx_opt,
 		return 1;
 	if (unlikely(get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_24DAYS))
 		return 1;
-
+	/*
+	 * Some OSes send SYN and SYNACK messages with tsval=0 tsecr=0,
+	 * then following tcp messages have valid values. Ignore 0 value,
+	 * or else 'negative' tsval might forbid us to accept their packets.
+	 */
+	if (!rx_opt->ts_recent)
+		return 1;
 	return 0;
 }