Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d74a7d7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.55 into android-4.19-q 



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

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6d20e205 78778071

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 54

SUBLEVEL = 55

EXTRAVERSION =

NAME = "People's Front"

net/ipv4/tcp_output.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}