mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
tcp: annotate data-races around tp->tsoffset
[ Upstream commitdd23c9f1e8
] do_tcp_getsockopt() reads tp->tsoffset while another cpu might change its value. Fixes:93be6ce0e9
("tcp: set and get per-socket timestamp") Signed-off-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20230719212857.3943972-3-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
949eb83880
commit
2c84a3d78a
2 changed files with 5 additions and 4 deletions
|
@ -3762,7 +3762,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
|
|||
if (!tp->repair)
|
||||
err = -EPERM;
|
||||
else
|
||||
tp->tsoffset = val - tcp_time_stamp_raw();
|
||||
WRITE_ONCE(tp->tsoffset, val - tcp_time_stamp_raw());
|
||||
break;
|
||||
case TCP_REPAIR_WINDOW:
|
||||
err = tcp_repair_set_window(tp, optval, optlen);
|
||||
|
@ -4260,7 +4260,7 @@ int do_tcp_getsockopt(struct sock *sk, int level,
|
|||
break;
|
||||
|
||||
case TCP_TIMESTAMP:
|
||||
val = tcp_time_stamp_raw() + tp->tsoffset;
|
||||
val = tcp_time_stamp_raw() + READ_ONCE(tp->tsoffset);
|
||||
break;
|
||||
case TCP_NOTSENT_LOWAT:
|
||||
val = tp->notsent_lowat;
|
||||
|
|
|
@ -307,8 +307,9 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
inet->inet_daddr,
|
||||
inet->inet_sport,
|
||||
usin->sin_port));
|
||||
tp->tsoffset = secure_tcp_ts_off(net, inet->inet_saddr,
|
||||
inet->inet_daddr);
|
||||
WRITE_ONCE(tp->tsoffset,
|
||||
secure_tcp_ts_off(net, inet->inet_saddr,
|
||||
inet->inet_daddr));
|
||||
}
|
||||
|
||||
inet->inet_id = get_random_u16();
|
||||
|
|
Loading…
Reference in a new issue