Commit 251cd405 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: annotate data-races around sk->sk_bind_phc

sk->sk_bind_phc is read locklessly. Add corresponding annotations.

Fixes: d463126e ("net: sock: extend SO_TIMESTAMPING for PHC binding")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3390b30
...@@ -894,7 +894,7 @@ static int sock_timestamping_bind_phc(struct sock *sk, int phc_index) ...@@ -894,7 +894,7 @@ static int sock_timestamping_bind_phc(struct sock *sk, int phc_index)
if (!match) if (!match)
return -EINVAL; return -EINVAL;
sk->sk_bind_phc = phc_index; WRITE_ONCE(sk->sk_bind_phc, phc_index);
return 0; return 0;
} }
...@@ -1720,7 +1720,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname, ...@@ -1720,7 +1720,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
case SO_TIMESTAMPING_OLD: case SO_TIMESTAMPING_OLD:
lv = sizeof(v.timestamping); lv = sizeof(v.timestamping);
v.timestamping.flags = READ_ONCE(sk->sk_tsflags); v.timestamping.flags = READ_ONCE(sk->sk_tsflags);
v.timestamping.bind_phc = sk->sk_bind_phc; v.timestamping.bind_phc = READ_ONCE(sk->sk_bind_phc);
break; break;
case SO_RCVTIMEO_OLD: case SO_RCVTIMEO_OLD:
......
...@@ -939,7 +939,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, ...@@ -939,7 +939,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
if (tsflags & SOF_TIMESTAMPING_BIND_PHC) if (tsflags & SOF_TIMESTAMPING_BIND_PHC)
hwtstamp = ptp_convert_timestamp(&hwtstamp, hwtstamp = ptp_convert_timestamp(&hwtstamp,
sk->sk_bind_phc); READ_ONCE(sk->sk_bind_phc));
if (ktime_to_timespec64_cond(hwtstamp, tss.ts + 2)) { if (ktime_to_timespec64_cond(hwtstamp, tss.ts + 2)) {
empty = 0; empty = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment