AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tcp: Fix data-races around sysctl_tcp_moderate_rcvbuf.

Browse Source 
commit 780476488844e070580bfc9e3bc7832ec1cea883 upstream.

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

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kuniyuki Iwashima 2022-07-20 09:50:18 -07:00 committed by Greg Kroah-Hartman
parent 77ac046a9a
commit 3e93312583
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/tcp_input.c
View File

@ -693,7 +693,7 @@ void tcp_rcv_space_adjust(struct sock *sk)
* <prev RTT . ><current RTT .. ><next RTT .... > * <prev RTT . ><current RTT .. ><next RTT .... >
*/ */
if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf && if (READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf) &&
!(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) { !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
int rcvmem, rcvbuf; int rcvmem, rcvbuf;
u64 rcvwin, grow; u64 rcvwin, grow;

2
net/mptcp/protocol.c
View File

@ -1421,7 +1421,7 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)
if (msk->rcvq_space.copied <= msk->rcvq_space.space) if (msk->rcvq_space.copied <= msk->rcvq_space.space)
goto new_measure; goto new_measure;
if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf && if (READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf) &&
!(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) { !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
int rcvmem, rcvbuf; int rcvmem, rcvbuf;
u64 rcvwin, grow; u64 rcvwin, grow;