diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 13:35:21 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 13:35:21 -0400 |
| commit | 458d20ca918be356403068bbd949e09868dd1ebe (patch) | |
| tree | d6a4e04b06b041d7aa1df5b70aec8a7239c3035c | |
| parent | 9b4ff2cb155ff43683ff690c2868e952c00ea05d (diff) | |
| download | longterm-queue-4.12-458d20ca918be356403068bbd949e09868dd1ebe.tar.gz | |
tcp: another refresh for newly added net wrapper patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch | 14 |
1 files changed, 7 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 5e32b5a..7becb1f 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 db3b494623964045f4827a34ca60457b8cacffce Mon Sep 17 00:00:00 2001 +From bc1a9e67c2490571b314248ed818ce68f5d9e14c 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() @@ -25,26 +25,26 @@ 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 1c4956c97de5..a9a33c789b01 100644 +index a225ff357cf8..1c927bd0c9c5 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4848,6 +4848,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root, +@@ -4846,6 +4846,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; -@@ -4866,6 +4867,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk) + +@@ -4857,6 +4858,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 = tcp_skb_next(skb, NULL); -@@ -4876,11 +4878,20 @@ static void tcp_collapse_ofo_queue(struct sock *sk) + skb = skb_rb_next(skb); +@@ -4867,11 +4869,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)) { |