diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-27 13:58:53 +0200 |
|---|---|---|
| committer | Shirle Yuen <shirleyshukyee@google.com> | 2018-08-28 14:56:36 -0700 |
| commit | 9fe9b4447de315c5b66c36c97f6bfe730e317245 (patch) | |
| tree | f6543069cb1a14dadfc891ae60aa7a705cf991f9 | |
| parent | 361e31c3ac3461dc3b627bd6261372f6101e6286 (diff) | |
| download | qcom-msm8x53-v3.18-9fe9b4447de315c5b66c36c97f6bfe730e317245.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 f08745648a222d6b76b2b5aaa3909adeb004c401)
| -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 ed9d2ed034f..841464242d1 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4689,6 +4689,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; |