diff options
author | Eric Dumazet <edumazet@google.com> | 2023-07-28 15:03:15 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2023-07-29 18:13:41 +0100 |
commit | 3c5b4d69c358a9275a8de98f87caf6eda644b086 (patch) | |
tree | fa45713da2bb8c9dc9c4728dcdb990ebd86c98d5 /net/core/sock.c | |
parent | b4b553253091cafe9ec38994acf42795e073bef5 (diff) | |
download | linux-stable-3c5b4d69c358a9275a8de98f87caf6eda644b086.tar.gz linux-stable-3c5b4d69c358a9275a8de98f87caf6eda644b086.tar.bz2 linux-stable-3c5b4d69c358a9275a8de98f87caf6eda644b086.zip |
net: annotate data-races around sk->sk_mark
sk->sk_mark is often read while another thread could change the value.
Fixes: 4a19ec5800fc ("[NET]: Introducing socket mark socket option.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 96616eb3869d..d831a3df2cef 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -990,7 +990,7 @@ EXPORT_SYMBOL(sock_set_rcvbuf); static void __sock_set_mark(struct sock *sk, u32 val) { if (val != sk->sk_mark) { - sk->sk_mark = val; + WRITE_ONCE(sk->sk_mark, val); sk_dst_reset(sk); } } @@ -1851,7 +1851,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname, optval, optlen, len); case SO_MARK: - v.val = sk->sk_mark; + v.val = READ_ONCE(sk->sk_mark); break; case SO_RCVMARK: |