android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: annotate data-races around tp->tcp_tx_delay

Browse Source 
[ Upstream commit 348b81b68b13ebd489a3e6a46aa1c384c731c919 ]

do_tcp_getsockopt() reads tp->tcp_tx_delay while another cpu
might change its value.

Fixes: a842fe1425 ("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>
This commit is contained in:
Eric Dumazet 2023-07-19 21:28:47 +00:00 committed by Greg Kroah-Hartman
parent 0d4d6b083d
commit 949eb83880
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/tcp.c
View File

@ -3780,7 +3780,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
case TCP_TX_DELAY: case TCP_TX_DELAY:
if (val) if (val)
tcp_enable_tx_delay(); tcp_enable_tx_delay();
tp->tcp_tx_delay = val; WRITE_ONCE(tp->tcp_tx_delay, val);
break; break;
default: default:
err = -ENOPROTOOPT; err = -ENOPROTOOPT;
@ -4256,7 +4256,7 @@ int do_tcp_getsockopt(struct sock *sk, int level,
break; break;
case TCP_TX_DELAY: case TCP_TX_DELAY:
val = tp->tcp_tx_delay; val = READ_ONCE(tp->tcp_tx_delay);
break; break;
case TCP_TIMESTAMP: case TCP_TIMESTAMP: