Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0cc41a3 authored by Eric Dumazet's avatar Eric Dumazet Committed by Sasha Levin
Browse files

tcp: refresh skb timestamp at retransmit time 



[ Upstream commit 10a81980fc47e64ffac26a073139813d3f697b64 ]

In the very unlikely case __tcp_retransmit_skb() can not use the cloning
done in tcp_transmit_skb(), we need to refresh skb_mstamp before doing
the copy and transmit, otherwise TCP TS val will be an exact copy of
original transmit.

Fixes: 7faee5c0 ("tcp: remove TCP_SKB_CB(skb)->when")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent b35237a8

net/ipv4/tcp_output.c

+4 −2
Original line number Diff line number Diff line
@@ -2532,8 +2532,10 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) 
	 */

	if (unlikely((NET_IP_ALIGN && ((unsigned long)skb->data & 3)) ||

		     skb_headroom(skb) >= 0xFFFF)) {

		struct sk_buff *nskb = __pskb_copy(skb, MAX_TCP_HEADER,

						   GFP_ATOMIC);

		struct sk_buff *nskb;



		skb_mstamp_get(&skb->skb_mstamp);

		nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);

		err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :

			     -ENOBUFS;

	} else {