diff options
| author |   Eric Dumazet <edumazet@google.com> | 2023-07-19 21:28:47 +0000 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2023-07-20 12:34:17 -0700 |
| commit | 348b81b68b13ebd489a3e6a46aa1c384c731c919 (patch) | |
| tree | 055f09e8001cd23eb870cc8248c297daf032472e | |
| parent | Merge branch 'net-support-stp-on-bridge-in-non-root-netns' (diff) | |
| download | wireguard-linux-348b81b68b13ebd489a3e6a46aa1c384c731c919.tar.xz wireguard-linux-348b81b68b13ebd489a3e6a46aa1c384c731c919.zip | |
tcp: annotate data-races around tp->tcp_tx_delay
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>
| -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 e03e08745308..bd6400e1ae9f 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3674,7 +3674,7 @@ 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; @@ -4154,7 +4154,7 @@ 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: |