Commit 310731e2 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

net: Fix data-races around sysctl_mem. 



While reading .sysctl_mem, it can be changed concurrently.
So, we need to add READ_ONCE() to avoid data-races.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d32edf1

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -1529,7 +1529,7 @@ void __sk_mem_reclaim(struct sock *sk, int amount); 
/* sysctl_mem values are in pages, we convert them in SK_MEM_QUANTUM units */

static inline long sk_prot_mem_limits(const struct sock *sk, int index)

{

	long val = sk->sk_prot->sysctl_mem[index];

	long val = READ_ONCE(sk->sk_prot->sysctl_mem[index]);



#if PAGE_SIZE > SK_MEM_QUANTUM

	val <<= PAGE_SHIFT - SK_MEM_QUANTUM_SHIFT;