From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 26 Jun 2019 08:29:26 +0000 (+0800)
Subject: 4.14-stable patches
X-Git-Tag: v4.4.184~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75a33cedea4722bdf4395247fbdc185eae201e29;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	tcp-refine-memory-limit-test-in-tcp_fragment.patch
---

diff --git a/queue-4.14/series b/queue-4.14/series
index 3fe3123e809..c73ec08eb1d 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -5,3 +5,4 @@ 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
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 <edumazet@google.com>
+Date: Fri, 21 Jun 2019 06:09:55 -0700
+Subject: tcp: refine memory limit test in tcp_fragment()
+
+From: Eric Dumazet <edumazet@google.com>
+
+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 <edumazet@google.com>
+Reported-by: Christoph Paasch <cpaasch@apple.com>
+Tested-by: Christoph Paasch <cpaasch@apple.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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;
+ 	}