提交 75d6bb8e 编写于 作者: K Kuniyuki Iwashima 提交者: Zheng Zengkai

tcp: Fix data-races around sysctl_tcp_moderate_rcvbuf.

stable inclusion
from stable-v5.10.135
commit 3e933125830a6f53de6725cf50174df6c3384368
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ZWFM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3e933125830a6f53de6725cf50174df6c3384368

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

commit 78047648 upstream.

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

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: NKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 4da0abe2
...@@ -693,7 +693,7 @@ void tcp_rcv_space_adjust(struct sock *sk) ...@@ -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;
......
...@@ -1421,7 +1421,7 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied) ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册