mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
net: annotate data-races around sk->sk_bind_phc
[ Upstream commit251cd405a9
] sk->sk_bind_phc is read locklessly. Add corresponding annotations. Fixes:d463126e23
("net: sock: extend SO_TIMESTAMPING for PHC binding") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Yangbo Lu <yangbo.lu@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
b352717b3c
commit
5f4836eca4
2 changed files with 3 additions and 3 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -1719,7 +1719,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:
|
||||||
|
|
|
@ -935,7 +935,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;
|
||||||
|
|
Loading…
Reference in a new issue