Skip to content

Commit 1aeb87b

Browse files
edumazetkuba-moo
authored andcommitted
tcp: annotate data-races around tp->notsent_lowat
tp->notsent_lowat can be read locklessly from do_tcp_getsockopt() and tcp_poll(). Fixes: c9bee3b ("tcp: TCP_NOTSENT_LOWAT socket option") Signed-off-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20230719212857.3943972-10-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent ae488c7 commit 1aeb87b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

include/net/tcp.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2061,7 +2061,11 @@ void __tcp_v4_send_check(struct sk_buff *skb, __be32 saddr, __be32 daddr);
20612061
static inline u32 tcp_notsent_lowat(const struct tcp_sock *tp)
20622062
{
20632063
struct net *net = sock_net((struct sock *)tp);
2064-
return tp->notsent_lowat ?: READ_ONCE(net->ipv4.sysctl_tcp_notsent_lowat);
2064+
u32 val;
2065+
2066+
val = READ_ONCE(tp->notsent_lowat);
2067+
2068+
return val ?: READ_ONCE(net->ipv4.sysctl_tcp_notsent_lowat);
20652069
}
20662070

20672071
bool tcp_stream_memory_free(const struct sock *sk, int wake);

net/ipv4/tcp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3664,7 +3664,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
36643664
err = tcp_repair_set_window(tp, optval, optlen);
36653665
break;
36663666
case TCP_NOTSENT_LOWAT:
3667-
tp->notsent_lowat = val;
3667+
WRITE_ONCE(tp->notsent_lowat, val);
36683668
sk->sk_write_space(sk);
36693669
break;
36703670
case TCP_INQ:
@@ -4164,7 +4164,7 @@ int do_tcp_getsockopt(struct sock *sk, int level,
41644164
val = tcp_time_stamp_raw() + READ_ONCE(tp->tsoffset);
41654165
break;
41664166
case TCP_NOTSENT_LOWAT:
4167-
val = tp->notsent_lowat;
4167+
val = READ_ONCE(tp->notsent_lowat);
41684168
break;
41694169
case TCP_INQ:
41704170
val = tp->recvmsg_inq;

0 commit comments

Comments
 (0)