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

Commit b7ca0f32 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14.131 (71162e65) into msm-4.14 



* refs/heads/tmp-71162e65:
  Linux 4.14.131
  tcp: refine memory limit test in tcp_fragment()

Change-Id: I404bf67cc62a2420ed2b884211ac725dbc75eb25
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 6712204d 71162e65

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;

	}