浏览代码

tcp: fix overflow in __tcp_retransmit_skb()

If a TCP socket gets a large write queue, an overflow can happen
in a test in __tcp_retransmit_skb() preventing all retransmits.

The flow then stalls and resets after timeouts.

Tested:

sysctl -w net.core.wmem_max=1000000000
netperf -H dest -- -s 1000000000

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Eric Dumazet 9 年之前
父节点
当前提交
ffb4d6c850
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      net/ipv4/tcp_output.c

+ 2 - 1
net/ipv4/tcp_output.c

@@ -2605,7 +2605,8 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
 	 * copying overhead: fragmentation, tunneling, mangling etc.
 	 * copying overhead: fragmentation, tunneling, mangling etc.
 	 */
 	 */
 	if (atomic_read(&sk->sk_wmem_alloc) >
 	if (atomic_read(&sk->sk_wmem_alloc) >
-	    min(sk->sk_wmem_queued + (sk->sk_wmem_queued >> 2), sk->sk_sndbuf))
+	    min_t(u32, sk->sk_wmem_queued + (sk->sk_wmem_queued >> 2),
+		  sk->sk_sndbuf))
 		return -EAGAIN;
 		return -EAGAIN;
 
 
 	if (skb_still_in_host_queue(sk, skb))
 	if (skb_still_in_host_queue(sk, skb))