From ca6ebe7f4424a39001350faf5e909148312afbac Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Wed, 23 May 2012 17:51:37 +0000
Subject: [PATCH] --- yaml --- r: 306953 b: refs/heads/master c:
 1ca7ee30630e1022dbcf1b51be20580815ffab73 h: refs/heads/master i:   306951:
 f0805a07a4db711976f41e33c43d66c9288d0f6e v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed811b92ccb4..41532e567f6f 100644
--- 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
index cfa2aa128342..b224eb8bce8b 100644
--- 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;