shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

net: annotate data-races around sk->sk_reserved_mem

Browse Source 
[ Upstream commit fe11fdcb42 ]

sk_getsockopt() runs locklessly. This means sk->sk_reserved_mem
can be read while other threads are changing its value.

Add missing annotations where they are needed.

Fixes: 2bb2f5fb21 ("net: add new socket option SO_RESERVE_MEM")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Wei Wang <weiwan@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet
2023-07-28 15:03:08 +00:00
committed by Greg Kroah-Hartman
parent 9da9ea9b13
commit 60d92bc9c0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/sock.c
View File

@@ -996,7 +996,7 @@ static void sock_release_reserved_memory(struct sock *sk, int bytes)
bytes = round_down(bytes, PAGE_SIZE); bytes = round_down(bytes, PAGE_SIZE);
WARN_ON(bytes > sk->sk_reserved_mem); WARN_ON(bytes > sk->sk_reserved_mem);
sk->sk_reserved_mem -= bytes; WRITE_ONCE(sk->sk_reserved_mem, sk->sk_reserved_mem - bytes);
sk_mem_reclaim(sk); sk_mem_reclaim(sk);
} }
@@ -1033,7 +1033,8 @@ static int sock_reserve_memory(struct sock *sk, int bytes)
} }
sk->sk_forward_alloc += pages << PAGE_SHIFT; sk->sk_forward_alloc += pages << PAGE_SHIFT;
sk->sk_reserved_mem += pages << PAGE_SHIFT; WRITE_ONCE(sk->sk_reserved_mem,
sk->sk_reserved_mem + (pages << PAGE_SHIFT));
return 0; return 0;
} }
@@ -1922,7 +1923,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
break; break;
case SO_RESERVE_MEM: case SO_RESERVE_MEM:
v.val = sk->sk_reserved_mem; v.val = READ_ONCE(sk->sk_reserved_mem);
break; break;
case SO_TXREHASH: case SO_TXREHASH: