commit 63e4049d39d7575803899132caf7ca4a3ffb454d
author Greg Kroah-Hartman <gregkh@google.com> Fri Jun 28 11:20:31 2019 +0200
committer Greg Kroah-Hartman <gregkh@google.com> Fri Jun 28 11:20:31 2019 +0200
tree 43dee3689b58223703436a20375005d5f01992d5
parent 636eface54368b74a8504b1fd5fdc0a619b2d25b
parent 72d1ee93e9311c88809585a114c138bc6a43627a

Merge 4.4.184 into android-4.4-n

Changes in 4.4.184
	tcp: refine memory limit test in tcp_fragment()
	Linux 4.4.184

Change-Id: I5005dee97f3b0162ff32bd38d11ff1db1fbcf20e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Makefile

diff --git a/Makefile b/Makefile
index 4ac762e..f098274 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 4
-SUBLEVEL = 183
+SUBLEVEL = 184
 EXTRAVERSION =
 NAME = Blurry Fish Butt
 

net/ipv4/tcp_output.c

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 6f7303d..c4f7902 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1161,7 +1161,7 @@
 	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;
 	}