diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2023-09-01 17:27:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-09-04 11:06:16 +0100 |
| commit | b192812905e4b134f7b7994b079eb647e9d2d37e (patch) | |
| tree | 332b4a89cd819ad45d81d5465c093852942323af /net | |
| parent | afe8764f76346ba838d4f162883e23d2fcfaa90e (diff) | |
| download | lwn-b192812905e4b134f7b7994b079eb647e9d2d37e.tar.gz lwn-b192812905e4b134f7b7994b079eb647e9d2d37e.zip | |
af_unix: Fix data race around sk->sk_err.
As with sk->sk_shutdown shown in the previous patch, sk->sk_err can be
read locklessly by unix_dgram_sendmsg().
Let's use READ_ONCE() for sk_err as well.
Note that the writer side is marked by commit cc04410af7de ("af_unix:
annotate lockless accesses to sk->sk_err").
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index e3da7eae9338..16584e2dd648 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2749,7 +2749,7 @@ static long sock_wait_for_wmem(struct sock *sk, long timeo) break; if (READ_ONCE(sk->sk_shutdown) & SEND_SHUTDOWN) break; - if (sk->sk_err) + if (READ_ONCE(sk->sk_err)) break; timeo = schedule_timeout(timeo); } |