Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ce44cf3 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

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: a842fe14 ("tcp: add optional per socket transmit delay")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230719212857.3943972-2-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c822536b

net/ipv4/tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -3177,7 +3177,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, 
	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;
@@ -3634,7 +3634,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: