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

Commit 7175277b authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

tcp: annotate data-races around rskq_defer_accept 



[ Upstream commit ae488c74422fb1dcd807c0201804b3b5e8a322a3 ]

do_tcp_getsockopt() reads rskq_defer_accept while another cpu
might change its value.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230719212857.3943972-9-edumazet@google.com


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

net/ipv4/tcp.c

+6 −5
Original line number Diff line number Diff line
@@ -3075,9 +3075,9 @@ static int do_tcp_setsockopt(struct sock *sk, int level, 


	case TCP_DEFER_ACCEPT:

		/* Translate value in seconds to number of retransmits */

		icsk->icsk_accept_queue.rskq_defer_accept =

		WRITE_ONCE(icsk->icsk_accept_queue.rskq_defer_accept,

			   secs_to_retrans(val, TCP_TIMEOUT_INIT / HZ,

					TCP_RTO_MAX / HZ);

					   TCP_RTO_MAX / HZ));

		break;



	case TCP_WINDOW_CLAMP:
@@ -3481,8 +3481,9 @@ static int do_tcp_getsockopt(struct sock *sk, int level, 
			val = (val ? : READ_ONCE(net->ipv4.sysctl_tcp_fin_timeout)) / HZ;

		break;

	case TCP_DEFER_ACCEPT:

		val = retrans_to_secs(icsk->icsk_accept_queue.rskq_defer_accept,

				      TCP_TIMEOUT_INIT / HZ, TCP_RTO_MAX / HZ);

		val = READ_ONCE(icsk->icsk_accept_queue.rskq_defer_accept);

		val = retrans_to_secs(val, TCP_TIMEOUT_INIT / HZ,

				      TCP_RTO_MAX / HZ);

		break;

	case TCP_WINDOW_CLAMP:

		val = tp->window_clamp;