Commit 5bf325a5 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: fix possible overflow in __sk_mem_raise_allocated()

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c0db24c
...@@ -1277,7 +1277,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk) ...@@ -1277,7 +1277,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk)
percpu_counter_inc(sk->sk_prot->sockets_allocated); percpu_counter_inc(sk->sk_prot->sockets_allocated);
} }
static inline int static inline u64
sk_sockets_allocated_read_positive(struct sock *sk) sk_sockets_allocated_read_positive(struct sock *sk)
{ {
return percpu_counter_read_positive(sk->sk_prot->sockets_allocated); return percpu_counter_read_positive(sk->sk_prot->sockets_allocated);
......
...@@ -2380,7 +2380,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) ...@@ -2380,7 +2380,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind)
} }
if (sk_has_memory_pressure(sk)) { if (sk_has_memory_pressure(sk)) {
int alloc; u64 alloc;
if (!sk_under_memory_pressure(sk)) if (!sk_under_memory_pressure(sk))
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment