mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 18:11:39 +00:00
tcp: Fix data-races around sysctl_tcp_min_snd_mss.
[ Upstream commit78eb166cde
] While reading sysctl_tcp_min_snd_mss, it can be changed concurrently. Thus, we need to add READ_ONCE() to its readers. Fixes:5f3e2bf008
("tcp: add tcp_min_snd_mss sysctl") Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
4d7dea651b
commit
0fc9357282
2 changed files with 3 additions and 2 deletions
|
@ -1722,7 +1722,8 @@ static inline int __tcp_mtu_to_mss(struct sock *sk, int pmtu)
|
||||||
mss_now -= icsk->icsk_ext_hdr_len;
|
mss_now -= icsk->icsk_ext_hdr_len;
|
||||||
|
|
||||||
/* Then reserve room for full set of TCP options and 8 bytes of data */
|
/* Then reserve room for full set of TCP options and 8 bytes of data */
|
||||||
mss_now = max(mss_now, sock_net(sk)->ipv4.sysctl_tcp_min_snd_mss);
|
mss_now = max(mss_now,
|
||||||
|
READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_min_snd_mss));
|
||||||
return mss_now;
|
return mss_now;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -173,7 +173,7 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
|
||||||
mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low) >> 1;
|
mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low) >> 1;
|
||||||
mss = min(READ_ONCE(net->ipv4.sysctl_tcp_base_mss), mss);
|
mss = min(READ_ONCE(net->ipv4.sysctl_tcp_base_mss), mss);
|
||||||
mss = max(mss, net->ipv4.sysctl_tcp_mtu_probe_floor);
|
mss = max(mss, net->ipv4.sysctl_tcp_mtu_probe_floor);
|
||||||
mss = max(mss, net->ipv4.sysctl_tcp_min_snd_mss);
|
mss = max(mss, READ_ONCE(net->ipv4.sysctl_tcp_min_snd_mss));
|
||||||
icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);
|
icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);
|
||||||
}
|
}
|
||||||
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
|
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
|
||||||
|
|
Loading…
Reference in a new issue