evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

This is the 4.4.184 stable release

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl0UCi4ACgkQONu9yGCS
 aT49SxAAliuKcsgijn3gXsIdsJLJPPx/vRJz5anTBAJ5uUX5pBRiEzNFNnU5mBho
 msD4sc1tW/6SopAqC+Wh4p+dg913SC3raVbhT2e+wXY0p8Tu0rCIeHdLOS0UzF9w
 ukYdQuhlXkxjr/m6bBRNxNKGgP0SV9oxWRGZoHGLMPNTVkIqonWyX/uBnXq0R5xo
 Xseu5F2C0BJ21rCwLxhzW1oQn4KXVj/qbZbv59q8KNdyupGMLJdZxQquhcERSLka
 Q7d1U5+YLT0/0+dr8aVAfA23pSHxxpnSocBb7jpPi8mABSTgWjJg983ESOWGA/iO
 /JwH7+und7yo4Iw5dwmEAY7WprXFuv3HgedNAT0dkSo70UjkxqpA+/LPEgOB6KPo
 AZuDQf/cnp7bktfFTucFVtlqc+odPG4yc/DZ9CygxAVqkQI9OWAbVYHL0zNN5LiD
 xbVJ+9sHg6m2e1PPaHQNJdzi9fKiWesMu3hhP5rovuqZa6QMtWxCviAkiKY8n0XM
 Wbc7Aoi7w2U/01YkklUq+Ku99ceh8d8i33j/WDawb0+Jy2/VynDu1faQTZ/Qx+in
 604TG6mOfru9nVaOXM8e2+PU4ZtCorXyc0+yPsAnQs+aCRrC3PEWSAAnCoCAXGMu
 nbQXsMFKwS3wjRYVbBsROjE+Nn2hhNiGleqpNaVMugr6V+TJNhI=
 =6BDD
 -----END PGP SIGNATURE-----

Merge 4.4.184 into android-4.4

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

Change-Id: I7119c826708041464de37eaec1d6c5a344be8124
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2019-06-28 11:20:02 +02:00
commit 282d84add5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 183
SUBLEVEL = 184
EXTRAVERSION =
NAME = Blurry Fish Butt

2
net/ipv4/tcp_output.c
View file

@ -1161,7 +1161,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
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;
}