This is the 4.19.55 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl0N84YACgkQONu9yGCS aT7mqBAAv8XxkTnSiRUBkamMzuDpTrAXUcDPYwirmN2YMaCh7swmah9yYA2tBC8Y gDnge7lTPOoodHFkILWFH6+Mcv2gAF0pPRKuxEV2n24HyrU9dH+lH2BzeMF8buVD 85vvOOFWzF9sd8Y1l1mRUWuyqrFLpYHoLOKVOTzlubbqC0Wa7IJphKjhHXiERemI /02AoukPa1agQvqrawneYkZafGX/+7zSOOl9JaTRjTK5sd6QSq6f4TekDAEIlxV3 meknC/JzTqmH+u2l5X0T8VNWdGXo1D+CwgyRvLR7J1cKmb3PGgTqKav74l0D+iO4 zvRPpEf8M2qAtC+KgdmtpeXMegS5uiMm3pzSjxZHWjh8iS60u1qjV53wh3qDy1er o4zGxKhBIA0Mpl53uufzYP2cs/wCp556maYhRp3sac+IwFTj8I0O4AQ5jxp9BLyT uBgmBq9/SnxhYrSZWJNk/B3nbA+fan7Cf5Cbn3lDRZGBbb9Ch+fhMG/rrTfrRAvl uZBmYBXaPTJ7iI7wrTKQaN6Dj6rPZLN+cbzXab3Gf72A4tlbr/XCUMvUxZCU9f8v //HdsySr5gWfhpymqz3AyQ0PccTe8TqoLYcoKUPDEMDwzIymF2JPM/X/XCtltb+p W6n9UpEhQTXT30oDwYlx6fpukeZzTdT6K0qwfIamnt3mk4ozQQQ= =1lZs -----END PGP SIGNATURE----- Merge 4.19.55 into android-4.19 Changes in 4.19.55 tcp: refine memory limit test in tcp_fragment() Linux 4.19.55 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
commit
65f49f0319
2 changed files with 3 additions and 2 deletions
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 19
|
||||
SUBLEVEL = 54
|
||||
SUBLEVEL = 55
|
||||
EXTRAVERSION =
|
||||
NAME = "People's Front"
|
||||
|
||||
|
|
|
@ -1282,7 +1282,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,
|
|||
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;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue