another patch

2 files changed, 41 insertions, 0 deletions

diff --git a/series b/series
index 8bbe32a..d67825f 100644
--- a/series
+++ b/series
@@ -1,3 +1,4 @@
+tcp-refine-memory-limit-test-in-tcp_fragment.patch
 alsa-seq-cover-unsubscribe_port-in-list_mutex.patch
 libata-extend-quirks-for-the-st1000lm024-drives-with-nolpm-quirk.patch
 signal-ptrace-don-t-leak-unitialized-kernel-memory-with-ptrace_peek_siginfo.patch
diff --git a/tcp-refine-memory-limit-test-in-tcp_fragment.patch b/tcp-refine-memory-limit-test-in-tcp_fragment.patch
new file mode 100644
index 0000000..29d67e2
--- /dev/null
+++ b/tcp-refine-memory-limit-test-in-tcp_fragment.patch
@@ -0,0 +1,40 @@
+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 |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/net/ipv4/tcp_output.c
++++ b/net/ipv4/tcp_output.c
+@@ -1152,7 +1152,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;
+ 	}