Skip to content

Commit dd23c9f

Browse files
edumazetkuba-moo
authored andcommitted
tcp: annotate data-races around tp->tsoffset
do_tcp_getsockopt() reads tp->tsoffset while another cpu might change its value. Fixes: 93be6ce ("tcp: set and get per-socket timestamp") Signed-off-by: Eric Dumazet <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 348b81b commit dd23c9f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

net/ipv4/tcp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3656,7 +3656,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
36563656
if (!tp->repair)
36573657
err = -EPERM;
36583658
else
3659-
tp->tsoffset = val - tcp_time_stamp_raw();
3659+
WRITE_ONCE(tp->tsoffset, val - tcp_time_stamp_raw());
36603660
break;
36613661
case TCP_REPAIR_WINDOW:
36623662
err = tcp_repair_set_window(tp, optval, optlen);
@@ -4158,7 +4158,7 @@ int do_tcp_getsockopt(struct sock *sk, int level,
41584158
break;
41594159

41604160
case TCP_TIMESTAMP:
4161-
val = tcp_time_stamp_raw() + tp->tsoffset;
4161+
val = tcp_time_stamp_raw() + READ_ONCE(tp->tsoffset);
41624162
break;
41634163
case TCP_NOTSENT_LOWAT:
41644164
val = tp->notsent_lowat;

net/ipv4/tcp_ipv4.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,9 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
307307
inet->inet_daddr,
308308
inet->inet_sport,
309309
usin->sin_port));
310-
tp->tsoffset = secure_tcp_ts_off(net, inet->inet_saddr,
311-
inet->inet_daddr);
310+
WRITE_ONCE(tp->tsoffset,
311+
secure_tcp_ts_off(net, inet->inet_saddr,
312+
inet->inet_daddr));
312313
}
313314

314315
inet->inet_id = get_random_u16();

0 commit comments

Comments
 (0)