diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-27 13:58:53 +0200 |
|---|---|---|
| committer | Shirle Yuen <shirleyshukyee@google.com> | 2018-08-03 14:18:46 -0700 |
| commit | 97c4a2a6c943caed9a16bfbbd1ff58d600c856c9 (patch) | |
| tree | 9912891b34306f9465be3dfd8b708c76d0b44b9f | |
| parent | 7a6db5f06f6924e34989ad6621199b74005a3399 (diff) | |
| download | rk-v4.4-97c4a2a6c943caed9a16bfbbd1ff58d600c856c9.tar.gz | |
Fix backport of "tcp: detect malicious patterns in tcp_collapse_ofo_queue()"
Based on review from Eric Dumazet, my backport of commit
3d4bf93ac12003f9b8e1e2de37fe27983deebdcf to older kernels was a bit
incorrect. This patch fixes this.
Reported-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 5efeaffe713e79e7b7ea09a7223ac544e0e4ce77)
| -rw-r--r-- | net/ipv4/tcp_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1f43e5fdacd7..64e468c8093b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4822,6 +4822,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk) /* Start new segment */ start = TCP_SKB_CB(skb)->seq; end = TCP_SKB_CB(skb)->end_seq; + range_truesize = skb->truesize; } else { if (before(TCP_SKB_CB(skb)->seq, start)) start = TCP_SKB_CB(skb)->seq; |