diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-07-19 21:28:47 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-07-27 08:47:03 +0200 |
| commit | 0bcee93252684eefb1ec634d42e436ed04189a37 (patch) | |
| tree | 2ff7363f9bd6a93b56b9e5cc72e391b67d173329 | |
| parent | 10013f764ad2957de08968bd02870b6b7683e3f6 (diff) | |
| download | linux-0bcee93252684eefb1ec634d42e436ed04189a37.tar.gz linux-0bcee93252684eefb1ec634d42e436ed04189a37.tar.bz2 linux-0bcee93252684eefb1ec634d42e436ed04189a37.zip | |
tcp: annotate data-races around tp->tcp_tx_delay
[ Upstream commit 348b81b68b13ebd489a3e6a46aa1c384c731c919 ]
do_tcp_getsockopt() reads tp->tcp_tx_delay while another cpu
might change its value.
Fixes: a842fe1425cb ("tcp: add optional per socket transmit delay")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230719212857.3943972-2-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index fc0fa1f2ca9b..8ff86431f44b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3679,7 +3679,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, case TCP_TX_DELAY: if (val) tcp_enable_tx_delay(); - tp->tcp_tx_delay = val; + WRITE_ONCE(tp->tcp_tx_delay, val); break; default: err = -ENOPROTOOPT; @@ -4151,7 +4151,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level, break; case TCP_TX_DELAY: - val = tp->tcp_tx_delay; + val = READ_ONCE(tp->tcp_tx_delay); break; case TCP_TIMESTAMP: |