From: Greg Kroah-Hartman Date: Thu, 27 Jun 2019 00:30:57 +0000 (+0800) Subject: drop tcp patch that was already in the last released kernels. X-Git-Tag: v5.1.16~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=829d743c4fc023569b0f68b098e52d3fc2527a8d;p=thirdparty%2Fkernel%2Fstable-queue.git drop tcp patch that was already in the last released kernels. --- diff --git a/queue-4.14/series b/queue-4.14/series index c73ec08eb1d..3fe3123e809 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -5,4 +5,3 @@ revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch ib-hfi1-close-psm-sdma_progress-sleep-window.patch block-add-a-lower-level-bio_add_page-interface.patch block-bio_iov_iter_get_pages-pin-more-pages-for-mult.patch -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 0b659aca9d9..00000000000 --- a/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch +++ /dev/null @@ -1,39 +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 | 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 index 8361a26d739..81d6829c903 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -25,4 +25,3 @@ cfg80211-fix-memory-leak-of-wiphy-device-name.patch mac80211-drop-robust-management-frames-from-unknown-ta.patch perf-ui-helpline-use-strlcpy-as-a-shorter-form-of-strncpy-explicit-set-nul.patch perf-help-remove-needless-use-of-strncpy.patch -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 472cbeae126..00000000000 --- a/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch +++ /dev/null @@ -1,39 +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 | 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 index c916e720b1f..ecda3b9cdcb 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -37,4 +37,3 @@ ib-hfi1-avoid-hardlockup-with-flushlist_lock.patch perf-ui-helpline-use-strlcpy-as-a-shorter-form-of-strncpy-explicit-set-nul.patch perf-help-remove-needless-use-of-strncpy.patch perf-header-fix-unchecked-usage-of-strncpy.patch -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 317c67e39b2..00000000000 --- a/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch +++ /dev/null @@ -1,39 +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 | 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; - }