mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
net: annotate data-races around sk->sk_max_pacing_rate
[ Upstream commitea7f45ef77
] sk_getsockopt() runs locklessly. This means sk->sk_max_pacing_rate can be read while other threads are changing its value. Fixes:62748f32d5
("net: introduce SO_MAX_PACING_RATE") 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>
This commit is contained in:
parent
2950c5ac65
commit
6c058a1f67
1 changed files with 6 additions and 3 deletions
|
@ -1297,7 +1297,8 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
|
|||
cmpxchg(&sk->sk_pacing_status,
|
||||
SK_PACING_NONE,
|
||||
SK_PACING_NEEDED);
|
||||
sk->sk_max_pacing_rate = ulval;
|
||||
/* Pairs with READ_ONCE() from sk_getsockopt() */
|
||||
WRITE_ONCE(sk->sk_max_pacing_rate, ulval);
|
||||
sk->sk_pacing_rate = min(sk->sk_pacing_rate, ulval);
|
||||
break;
|
||||
}
|
||||
|
@ -1680,12 +1681,14 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
|
|||
#endif
|
||||
|
||||
case SO_MAX_PACING_RATE:
|
||||
/* The READ_ONCE() pair with the WRITE_ONCE() in sk_setsockopt() */
|
||||
if (sizeof(v.ulval) != sizeof(v.val) && len >= sizeof(v.ulval)) {
|
||||
lv = sizeof(v.ulval);
|
||||
v.ulval = sk->sk_max_pacing_rate;
|
||||
v.ulval = READ_ONCE(sk->sk_max_pacing_rate);
|
||||
} else {
|
||||
/* 32bit version */
|
||||
v.val = min_t(unsigned long, sk->sk_max_pacing_rate, ~0U);
|
||||
v.val = min_t(unsigned long, ~0U,
|
||||
READ_ONCE(sk->sk_max_pacing_rate));
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in a new issue