From 84cec654560a25ec5862320908d79a872ab1c287 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 26 Jun 2019 16:34:02 +0800 Subject: [PATCH] add queues for 4.4, 4.9, and 4.14 back with just one patch. --- queue-4.14/series | 1 + ...ne-memory-limit-test-in-tcp_fragment.patch | 39 +++++++++++++++++++ queue-4.4/series | 1 + ...ne-memory-limit-test-in-tcp_fragment.patch | 39 +++++++++++++++++++ queue-4.9/series | 1 + ...ne-memory-limit-test-in-tcp_fragment.patch | 39 +++++++++++++++++++ 6 files changed, 120 insertions(+) create mode 100644 queue-4.14/series create mode 100644 queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch create mode 100644 queue-4.4/series create mode 100644 queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch create mode 100644 queue-4.9/series create mode 100644 queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..fbbdf72e9e7 --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..0b659aca9d9 --- /dev/null +++ b/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch @@ -0,0 +1,39 @@ +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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -1274,7 +1274,7 @@ 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 + 0x20000)) { + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); + return -ENOMEM; + } diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..fbbdf72e9e7 --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..472cbeae126 --- /dev/null +++ b/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch @@ -0,0 +1,39 @@ +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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -1161,7 +1161,7 @@ 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 + 0x20000)) { + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); + return -ENOMEM; + } diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..fbbdf72e9e7 --- /dev/null +++ b/queue-4.9/series @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..317c67e39b2 --- /dev/null +++ b/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch @@ -0,0 +1,39 @@ +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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -1185,7 +1185,7 @@ 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 + 0x20000)) { + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); + return -ENOMEM; + } -- 2.47.3