diff options
| author | Yousuk Seung | 2017-10-25 01:44:42 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-10-26 10:47:55 +0200 |
| commit | 5889e2c0e441d84060e66211ed5c4517ca591167 (patch) | |
| tree | 6acbd5d5fbf960b0c07d1899aa42c30acf51790a /net/ipv4/tcp_output.c | |
| parent | tcp/dccp: fix other lockdep splats accessing ireq_opt (diff) | |
| download | kernel-qcow2-linux-5889e2c0e441d84060e66211ed5c4517ca591167.tar.gz kernel-qcow2-linux-5889e2c0e441d84060e66211ed5c4517ca591167.tar.xz kernel-qcow2-linux-5889e2c0e441d84060e66211ed5c4517ca591167.zip | |
tcp: call tcp_rate_skb_sent() when retransmit with unaligned skb->data
Current implementation calls tcp_rate_skb_sent() when tcp_transmit_skb()
is called when it clones skb only. Not calling tcp_rate_skb_sent() is OK
for all such code paths except from __tcp_retransmit_skb() which happens
when skb->data address is not aligned. This may rarely happen e.g. when
small amount of data is sent initially and the receiver partially acks
odd number of bytes for some reason, possibly malicious.
Signed-off-by: Yousuk Seung <ysseung@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 973befc36fd4..1151870018e3 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2843,8 +2843,10 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs) nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC); err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) : -ENOBUFS; - if (!err) + if (!err) { skb->skb_mstamp = tp->tcp_mstamp; + tcp_rate_skb_sent(sk, skb); + } } else { err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC); } |