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

Commit 558a2949 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Greg Kroah-Hartman
Browse files

tcp: Fix a data-race around sysctl_tcp_min_tso_segs. 



[ Upstream commit e0bb4ab9dfddd872622239f49fb2bd403b70853b ]

While reading sysctl_tcp_min_tso_segs, it can be changed concurrently.
Thus, we need to add READ_ONCE() to its reader.

Fixes: 95bd09eb ("tcp: TSO packets automatic sizing")
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fb200869

net/ipv4/tcp_output.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1761,7 +1761,7 @@ static u32 tcp_tso_segs(struct sock *sk, unsigned int mss_now) 




	min_tso = ca_ops->min_tso_segs ?

	min_tso = ca_ops->min_tso_segs ?

			ca_ops->min_tso_segs(sk) :

			ca_ops->min_tso_segs(sk) :

			sock_net(sk)->ipv4.sysctl_tcp_min_tso_segs;

			READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_min_tso_segs);





	tso_segs = tcp_tso_autosize(sk, mss_now, min_tso);

	tso_segs = tcp_tso_autosize(sk, mss_now, min_tso);

	return min_t(u32, tso_segs, sk->sk_gso_max_segs);

	return min_t(u32, tso_segs, sk->sk_gso_max_segs);