---

yaml --- r: 306953 b: refs/heads/master c: 1ca7ee3 h: refs/heads/master i: 306951: f0805a0 v: v3
git-mirror · May 24, 2012 · ca6ebe7 · ca6ebe7
1 parent fe640cf
commit ca6ebe7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e49cc0da7283088c5e03d475ffe2fdcb24a6d5b1
+refs/heads/master: 1ca7ee30630e1022dbcf1b51be20580815ffab73
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -4555,6 +4555,11 @@ static bool tcp_try_coalesce(struct sock *sk,
 
 	if (tcp_hdr(from)->fin)
 		return false;
+
+	/* Its possible this segment overlaps with prior segment in queue */
+	if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq)
+		return false;
+
 	if (!skb_try_coalesce(to, from, fragstolen, &delta))
 		return false;