提交 23e6dedb 编写于 作者: K Kuniyuki Iwashima 提交者: Zheng Zengkai

tcp: Fix a data-race around sysctl_tcp_comp_sack_nr.

stable inclusion
from stable-v5.10.135
commit f310fb69a0a833b325bf36b21587ae0e52450d58
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=f310fb69a0a833b325bf36b21587ae0e52450d58

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

[ Upstream commit 79f55473 ]

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

Fixes: 9c21d2fc ("tcp: add tcp_comp_sack_nr sysctl")
Signed-off-by: NKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 1011e87e
...@@ -5462,7 +5462,7 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible) ...@@ -5462,7 +5462,7 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)
} }
if (!tcp_is_sack(tp) || if (!tcp_is_sack(tp) ||
tp->compressed_ack >= sock_net(sk)->ipv4.sysctl_tcp_comp_sack_nr) tp->compressed_ack >= READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_comp_sack_nr))
goto send_now; goto send_now;
if (tp->compressed_ack_rcv_nxt != tp->rcv_nxt) { if (tp->compressed_ack_rcv_nxt != tp->rcv_nxt) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册