fixup the tcp patch

diff --git a/queue-3.18/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_queue.patch b/queue-3.18/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_queue.patch
index 8012acf57bbdd00fa60b4a0d5b7e6e2f7d9ff5a1..bcc3bbe943bdbbd3f852cc4b0e5e1fb9030ebef5 100644 (file)
--- a/queue-3.18/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_queue.patch
+++ b/queue-3.18/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_queue.patch
@@ -26,8 +26,8 @@ Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- net/ipv4/tcp_input.c |   15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
+ net/ipv4/tcp_input.c |   16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
 
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        head = skb;
  
        for (;;) {
-@@ -4675,8 +4677,17 @@ static void tcp_collapse_ofo_queue(struc
+@@ -4675,14 +4677,24 @@ static void tcp_collapse_ofo_queue(struc
                if (!skb ||
                    after(TCP_SKB_CB(skb)->seq, end) ||
                    before(TCP_SKB_CB(skb)->end_seq, start)) {
@@ -67,3 +67,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        head = skb;
                        if (!skb)
                                break;
+                       /* 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;

diff --git a/queue-4.4/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_queue.patch b/queue-4.4/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_queue.patch
index f669daa88ce7b178030b4bf3ae37465815200ac9..6a46040be3fbe854a063eea827d9f6caf067cbbf 100644 (file)
--- a/queue-4.4/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_queue.patch
+++ b/queue-4.4/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_queue.patch
@@ -26,8 +26,8 @@ Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- net/ipv4/tcp_input.c |   15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
+ net/ipv4/tcp_input.c |   16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
 
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        head = skb;
  
        for (;;) {
-@@ -4812,8 +4814,17 @@ static void tcp_collapse_ofo_queue(struc
+@@ -4812,14 +4814,24 @@ static void tcp_collapse_ofo_queue(struc
                if (!skb ||
                    after(TCP_SKB_CB(skb)->seq, end) ||
                    before(TCP_SKB_CB(skb)->end_seq, start)) {
@@ -67,3 +67,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        head = skb;
                        if (!skb)
                                break;
+                       /* 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;