Commit 8abcda03 authored by Eric Dumazet's avatar Eric Dumazet Committed by sanglipeng
Browse files

tcp: annotate data-races around icsk->icsk_syn_retries 

stable inclusion
from stable-v5.10.188
commit 9168bd8f54c53020d642836abd6a20e6a682bce6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8KYFP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9168bd8f54c53020d642836abd6a20e6a682bce6



--------------------------------

[ Upstream commit 3a037f0f ]

do_tcp_getsockopt() and reqsk_timer_handler() read
icsk->icsk_syn_retries 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-7-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent f2e2a53b

net/ipv4/inet_connection_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static void reqsk_timer_handler(struct timer_list *t) 
	if (inet_sk_state_load(sk_listener) != TCP_LISTEN)

		goto drop;



	max_syn_ack_retries = icsk->icsk_syn_retries ? :

	max_syn_ack_retries = READ_ONCE(icsk->icsk_syn_retries) ? :

		READ_ONCE(net->ipv4.sysctl_tcp_synack_retries);

	/* Normally all the openreqs are young and become mature

	 * (i.e. converted to established socket) for first timeout.

net/ipv4/tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -3071,7 +3071,7 @@ int tcp_sock_set_syncnt(struct sock *sk, int val) 
		return -EINVAL;



	lock_sock(sk);

	inet_csk(sk)->icsk_syn_retries = val;

	WRITE_ONCE(inet_csk(sk)->icsk_syn_retries, val);

	release_sock(sk);

	return 0;

}
@@ -3336,7 +3336,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
		if (val < 1 || val > MAX_TCP_SYNCNT)

			err = -EINVAL;

		else

			icsk->icsk_syn_retries = val;

			WRITE_ONCE(icsk->icsk_syn_retries, val);

		break;



	case TCP_SAVE_SYN:
@@ -3743,7 +3743,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level, 
		val = keepalive_probes(tp);

		break;

	case TCP_SYNCNT:

		val = icsk->icsk_syn_retries ? :

		val = READ_ONCE(icsk->icsk_syn_retries) ? :

			READ_ONCE(net->ipv4.sysctl_tcp_syn_retries);

		break;

	case TCP_LINGER2: