mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
tcp: Fix data-races around sysctl_tcp_workaround_signed_windows.
[ Upstream commit0f1e4d0659
] While reading sysctl_tcp_workaround_signed_windows, it can be changed concurrently. Thus, we need to add READ_ONCE() to its readers. Fixes:15d99e02ba
("[TCP]: sysctl to allow TCP window > 32767 sans wscale") 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
5cd3256fc5
commit
5bb0140ea9
1 changed files with 2 additions and 2 deletions
|
@ -227,7 +227,7 @@ void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss,
|
|||
* which we interpret as a sign the remote TCP is not
|
||||
* misinterpreting the window field as a signed quantity.
|
||||
*/
|
||||
if (sock_net(sk)->ipv4.sysctl_tcp_workaround_signed_windows)
|
||||
if (READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_workaround_signed_windows))
|
||||
(*rcv_wnd) = min(space, MAX_TCP_WINDOW);
|
||||
else
|
||||
(*rcv_wnd) = min_t(u32, space, U16_MAX);
|
||||
|
@ -282,7 +282,7 @@ static u16 tcp_select_window(struct sock *sk)
|
|||
* scaled window.
|
||||
*/
|
||||
if (!tp->rx_opt.rcv_wscale &&
|
||||
sock_net(sk)->ipv4.sysctl_tcp_workaround_signed_windows)
|
||||
READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_workaround_signed_windows))
|
||||
new_win = min(new_win, MAX_TCP_WINDOW);
|
||||
else
|
||||
new_win = min(new_win, (65535U << tp->rx_opt.rcv_wscale));
|
||||
|
|
Loading…
Reference in a new issue