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

Commit 71162e65 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.131 into android-4.14 



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

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fe57a37b f4cc0ed9

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 130

SUBLEVEL = 131

EXTRAVERSION =

NAME = Petit Gorille

net/ipv4/tcp_output.c

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

	}