diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 12:15:42 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 12:15:42 -0400 |
| commit | 9d26cf00ade8878c2c72e287a615539c2a67d1d5 (patch) | |
| tree | fa4e93963d8e33c946597efb435cc1c8f68af5e4 | |
| parent | 5102e6b2de8e4f3b88c544a8fa2c46441dff1d8d (diff) | |
| download | longterm-queue-4.12-9d26cf00ade8878c2c72e287a615539c2a67d1d5.tar.gz | |
tcp: another ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch b/queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch index e612f61..5e32b5a 100644 --- a/queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch +++ b/queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch @@ -1,4 +1,4 @@ -From 3d4bf93ac12003f9b8e1e2de37fe27983deebdcf Mon Sep 17 00:00:00 2001 +From db3b494623964045f4827a34ca60457b8cacffce Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:19 -0700 Subject: [PATCH] tcp: detect malicious patterns in tcp_collapse_ofo_queue() @@ -22,28 +22,29 @@ that are proven to be malicious. Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index 53289911362a..78068b902e7b 100644 +index 1c4956c97de5..a9a33c789b01 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4902,6 +4902,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root, +@@ -4848,6 +4848,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root, static void tcp_collapse_ofo_queue(struct sock *sk) { struct tcp_sock *tp = tcp_sk(sk); + u32 range_truesize, sum_tiny = 0; struct sk_buff *skb, *head; + struct rb_node *p; u32 start, end; - -@@ -4913,6 +4914,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk) +@@ -4866,6 +4867,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk) } start = TCP_SKB_CB(skb)->seq; end = TCP_SKB_CB(skb)->end_seq; + range_truesize = skb->truesize; for (head = skb;;) { - skb = skb_rb_next(skb); -@@ -4923,11 +4925,20 @@ static void tcp_collapse_ofo_queue(struct sock *sk) + skb = tcp_skb_next(skb, NULL); +@@ -4876,11 +4878,20 @@ static void tcp_collapse_ofo_queue(struct sock *sk) if (!skb || after(TCP_SKB_CB(skb)->seq, end) || before(TCP_SKB_CB(skb)->end_seq, start)) { |