From: Greg Kroah-Hartman Date: Sat, 22 Jun 2019 07:39:16 +0000 (+0200) Subject: drop tcp patch from 4.4, 4.9, and 4.14 queues as it breaks the build. X-Git-Tag: v5.1.14~1 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3c4da58feeac7e68109f8d6440180dd1b3fb58df;p=thirdparty%2Fkernel%2Fstable-queue.git drop tcp patch from 4.4, 4.9, and 4.14 queues as it breaks the build. --- diff --git a/queue-4.14/series b/queue-4.14/series index fbbdf72e9e7..e69de29bb2d 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1 +0,0 @@ -tcp-refine-memory-limit-test-in-tcp_fragment.patch diff --git a/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch b/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch deleted file mode 100644 index 70218072e5b..00000000000 --- a/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b6653b3629e5b88202be3c9abc44713973f5c4b4 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Fri, 21 Jun 2019 06:09:55 -0700 -Subject: tcp: refine memory limit test in tcp_fragment() - -From: Eric Dumazet - -commit b6653b3629e5b88202be3c9abc44713973f5c4b4 upstream. - -tcp_fragment() might be called for skbs in the write queue. - -Memory limits might have been exceeded because tcp_sendmsg() only -checks limits at full skb (64KB) boundaries. - -Therefore, we need to make sure tcp_fragment() wont punish applications -that might have setup very low SO_SNDBUF values. - -Fixes: f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits") -Signed-off-by: Eric Dumazet -Reported-by: Christoph Paasch -Tested-by: Christoph Paasch -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - net/ipv4/tcp_output.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -1274,7 +1274,8 @@ int tcp_fragment(struct sock *sk, struct - if (nsize < 0) - nsize = 0; - -- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) { -+ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf && -+ tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); - return -ENOMEM; - } diff --git a/queue-4.4/series b/queue-4.4/series index fbbdf72e9e7..e69de29bb2d 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1 +0,0 @@ -tcp-refine-memory-limit-test-in-tcp_fragment.patch diff --git a/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch b/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch deleted file mode 100644 index 7464b0c3029..00000000000 --- a/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b6653b3629e5b88202be3c9abc44713973f5c4b4 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Fri, 21 Jun 2019 06:09:55 -0700 -Subject: tcp: refine memory limit test in tcp_fragment() - -From: Eric Dumazet - -commit b6653b3629e5b88202be3c9abc44713973f5c4b4 upstream. - -tcp_fragment() might be called for skbs in the write queue. - -Memory limits might have been exceeded because tcp_sendmsg() only -checks limits at full skb (64KB) boundaries. - -Therefore, we need to make sure tcp_fragment() wont punish applications -that might have setup very low SO_SNDBUF values. - -Fixes: f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits") -Signed-off-by: Eric Dumazet -Reported-by: Christoph Paasch -Tested-by: Christoph Paasch -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - net/ipv4/tcp_output.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -1161,7 +1161,8 @@ int tcp_fragment(struct sock *sk, struct - if (nsize < 0) - nsize = 0; - -- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) { -+ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf && -+ tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); - return -ENOMEM; - } diff --git a/queue-4.9/series b/queue-4.9/series index fbbdf72e9e7..e69de29bb2d 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1 +0,0 @@ -tcp-refine-memory-limit-test-in-tcp_fragment.patch diff --git a/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch b/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch deleted file mode 100644 index dc70048226f..00000000000 --- a/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b6653b3629e5b88202be3c9abc44713973f5c4b4 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Fri, 21 Jun 2019 06:09:55 -0700 -Subject: tcp: refine memory limit test in tcp_fragment() - -From: Eric Dumazet - -commit b6653b3629e5b88202be3c9abc44713973f5c4b4 upstream. - -tcp_fragment() might be called for skbs in the write queue. - -Memory limits might have been exceeded because tcp_sendmsg() only -checks limits at full skb (64KB) boundaries. - -Therefore, we need to make sure tcp_fragment() wont punish applications -that might have setup very low SO_SNDBUF values. - -Fixes: f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits") -Signed-off-by: Eric Dumazet -Reported-by: Christoph Paasch -Tested-by: Christoph Paasch -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - net/ipv4/tcp_output.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -1185,7 +1185,8 @@ int tcp_fragment(struct sock *sk, struct - if (nsize < 0) - nsize = 0; - -- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) { -+ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf && -+ tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); - return -ENOMEM; - }