diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2023-09-01 17:27:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-09-23 10:59:59 +0200 |
| commit | f1ba9a03b1669233f26bb70b2496d379470c7e8f (patch) | |
| tree | de03b2e0c1f46897a8e12f5e9d7ccfa9e4ddd020 | |
| parent | 1ffed3ea8750a84b45cb6a19594409e22157c39b (diff) | |
| download | linux-stable-f1ba9a03b1669233f26bb70b2496d379470c7e8f.tar.gz linux-stable-f1ba9a03b1669233f26bb70b2496d379470c7e8f.tar.bz2 linux-stable-f1ba9a03b1669233f26bb70b2496d379470c7e8f.zip | |
af_unix: Fix data race around sk->sk_err.
[ Upstream commit b192812905e4b134f7b7994b079eb647e9d2d37e ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -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 79d61be28518..9979cd602dfa 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2225,7 +2225,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); } |