summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2019-02-12 12:26:27 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-05 09:21:10 +0100
commitd1dde4137a041ff4c928e3879cb95b300d901e9e (patch)
treec595e7ee39dab85aedc707185a26db51fce93b9e /net
parent3d5e2bb84851df18fc99884df89b4b44a297fabf (diff)
downloadlinux-stable-d1dde4137a041ff4c928e3879cb95b300d901e9e.tar.gz
linux-stable-d1dde4137a041ff4c928e3879cb95b300d901e9e.tar.bz2
linux-stable-d1dde4137a041ff4c928e3879cb95b300d901e9e.zip
net: fix possible overflow in __sk_mem_raise_allocated()
[ Upstream commit 5bf325a53202b8728cf7013b72688c46071e212e ] With many active TCP sockets, fat TCP sockets could fool __sk_mem_raise_allocated() thanks to an overflow. They would increase their share of the memory, instead of decreasing it. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/core/sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index ba4f843cdd1d..bbde5f6a7dc9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2435,7 +2435,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind)
}
if (sk_has_memory_pressure(sk)) {
- int alloc;
+ u64 alloc;
if (!sk_under_memory_pressure(sk))
return 1;