Commit efaf24e3 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Paolo Abeni
Browse files

af_unix: Annotate data-race of sk->sk_shutdown in sk_diag_fill(). 



While dumping sockets via UNIX_DIAG, we do not hold unix_state_lock().

Let's use READ_ONCE() to read sk->sk_shutdown.

Fixes: e4e541a8 ("sock-diag: Report shutdown for inet and unix sockets (v2)")
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5d915e58

net/unix/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r 
	    sock_diag_put_meminfo(sk, skb, UNIX_DIAG_MEMINFO))

		goto out_nlmsg_trim;



	if (nla_put_u8(skb, UNIX_DIAG_SHUTDOWN, sk->sk_shutdown))

	if (nla_put_u8(skb, UNIX_DIAG_SHUTDOWN, READ_ONCE(sk->sk_shutdown)))

		goto out_nlmsg_trim;



	if ((req->udiag_show & UDIAG_SHOW_UID) &&