diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-06-28 11:19:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-06-28 11:19:20 +0200 |
| commit | 26c229d8e9b3bca26cccc4faf59347d87e417f86 (patch) | |
| tree | a69abf9744fea6314fb5894df2c9e79fbd97873d /net/ipv4/tcp_output.c | |
| parent | 032bab83065ff4fc9e13a74975863355b6c398a3 (diff) | |
| parent | 72d1ee93e9311c88809585a114c138bc6a43627a (diff) | |
Merge 4.4.184 into android-4.4-p
Changes in 4.4.184
tcp: refine memory limit test in tcp_fragment()
Linux 4.4.184
Change-Id: Id26e1b524dd23656ed67623d16ffbaff3d0b906a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 6f7303d51274..c4f790251a7b 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -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; } |