summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLennart Schulte <lennart.schulte@nets.rwth-aachen.de>2010-03-17 03:16:29 +0100
committerDavid S. Miller <davem@davemloft.net>2010-03-20 06:47:22 +0100
commit6830c25b7d08fbbd922959425193791bc42079f2 (patch)
tree4a3175a62c62375a5b7a611914842ccc48328aa1 /net
parentnet: ipmr/ip6mr: fix potential out-of-bounds vif_table access (diff)
downloadlinux-6830c25b7d08fbbd922959425193791bc42079f2.tar.xz
linux-6830c25b7d08fbbd922959425193791bc42079f2.zip
tcp: Fix tcp_mark_head_lost() with packets == 0
A packet is marked as lost in case packets == 0, although nothing should be done. This results in a too early retransmitted packet during recovery in some cases. This small patch fixes this issue by returning immediately. Signed-off-by: Lennart Schulte <lennart.schulte@nets.rwth-aachen.de> Signed-off-by: Arnd Hannemann <hannemann@nets.rwth-aachen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_input.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 788851ca8c5d..c096a4218b8f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2511,6 +2511,9 @@ static void tcp_mark_head_lost(struct sock *sk, int packets)
int err;
unsigned int mss;
+ if (packets == 0)
+ return;
+
WARN_ON(packets > tp->packets_out);
if (tp->lost_skb_hint) {
skb = tp->lost_skb_hint;