aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv4/tcp_input.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index cfa2aa128342..b224eb8bce8b 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4555,6 +4555,11 @@ static bool tcp_try_coalesce(struct sock *sk,
4555 4555
4556 if (tcp_hdr(from)->fin) 4556 if (tcp_hdr(from)->fin)
4557 return false; 4557 return false;
4558
4559 /* Its possible this segment overlaps with prior segment in queue */
4560 if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq)
4561 return false;
4562
4558 if (!skb_try_coalesce(to, from, fragstolen, &delta)) 4563 if (!skb_try_coalesce(to, from, fragstolen, &delta))
4559 return false; 4564 return false;
4560 4565