diff options
| author | Eric Dumazet <edumazet@google.com> | 2019-02-12 23:26:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-05 17:27:07 +0300 |
| commit | e6bcac89af46d7077184cd900befe7678df077f2 (patch) | |
| tree | f0eb961aa29bb16b64692ae3828a1ab64a1f22da | |
| parent | 2798fd0b78ec9a9592dfccbfd710c5ee069a6b9b (diff) | |
| download | linux-e6bcac89af46d7077184cd900befe7678df077f2.tar.xz | |
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>
| -rw-r--r-- | include/net/sock.h | 2 | ||||
| -rw-r--r-- | net/core/sock.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 5ed4786a2058..de4434284a34 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1282,7 +1282,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk) percpu_counter_inc(prot->sockets_allocated); } -static inline int +static inline u64 sk_sockets_allocated_read_positive(struct sock *sk) { struct proto *prot = sk->sk_prot; diff --git a/net/core/sock.c b/net/core/sock.c index 8aa4a5f89572..0f4c15fcd87d 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2122,7 +2122,7 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind) } if (sk_has_memory_pressure(sk)) { - int alloc; + u64 alloc; if (!sk_under_memory_pressure(sk)) return 1; |