Commit 744efeae authored Jul 19, 2023 by Eric Dumazet Committed by sanglipeng Dec 01, 2023

tcp: annotate data-races around icsk->icsk_user_timeout

stable inclusion
from stable-v5.10.188
commit d01afbfc2f7df4fc943edd5414589cdc1bffb4bd
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=d01afbfc2f7df4fc943edd5414589cdc1bffb4bd



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

[ Upstream commit 26023e91 ]

This field can be read locklessly from do_tcp_getsockopt()

Fixes: dca43c75 ("tcp: Add TCP_USER_TIMEOUT socket option.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230719212857.3943972-11-edumazet@google.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent 57386a32

net/ipv4/tcp.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3080,7 +3080,7 @@ EXPORT_SYMBOL(tcp_sock_set_syncnt);
		void tcp_sock_set_user_timeout(struct sock *sk, u32 val)
		{
		lock_sock(sk);
		inet_csk(sk)->icsk_user_timeout = val;
		WRITE_ONCE(inet_csk(sk)->icsk_user_timeout, val);
		release_sock(sk);
		}
		EXPORT_SYMBOL(tcp_sock_set_user_timeout);
		@@ -3392,7 +3392,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname,
		if (val < 0)
		err = -EINVAL;
		else
		icsk->icsk_user_timeout = val;
		WRITE_ONCE(icsk->icsk_user_timeout, val);
		break;

		case TCP_FASTOPEN:
		@@ -3890,7 +3890,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
		break;

		case TCP_USER_TIMEOUT:
		val = icsk->icsk_user_timeout;
		val = READ_ONCE(icsk->icsk_user_timeout);
		break;

		case TCP_FASTOPEN: