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

Commit d1dde413 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3d5e2bb8

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk) 
	percpu_counter_inc(sk->sk_prot->sockets_allocated);

}



static inline int

static inline u64

sk_sockets_allocated_read_positive(struct sock *sk)

{

	return percpu_counter_read_positive(sk->sk_prot->sockets_allocated);

net/core/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -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;