提交 30eecd9c 编写于 作者: K Kuniyuki Iwashima 提交者: Zheng Zengkai

ip: Fix data-races around sysctl_ip_no_pmtu_disc.

stable inclusion
from stable-v5.10.134
commit 5e343e3ef464a5dbcc8fd3a99830908e31a4a61d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ZVR7

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

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

[ Upstream commit 0968d2a4 ]

While reading sysctl_ip_no_pmtu_disc, 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: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 14f2217f
...@@ -338,7 +338,7 @@ static int inet_create(struct net *net, struct socket *sock, int protocol, ...@@ -338,7 +338,7 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
inet->hdrincl = 1; inet->hdrincl = 1;
} }
if (net->ipv4.sysctl_ip_no_pmtu_disc) if (READ_ONCE(net->ipv4.sysctl_ip_no_pmtu_disc))
inet->pmtudisc = IP_PMTUDISC_DONT; inet->pmtudisc = IP_PMTUDISC_DONT;
else else
inet->pmtudisc = IP_PMTUDISC_WANT; inet->pmtudisc = IP_PMTUDISC_WANT;
......
...@@ -887,7 +887,7 @@ static bool icmp_unreach(struct sk_buff *skb) ...@@ -887,7 +887,7 @@ static bool icmp_unreach(struct sk_buff *skb)
* values please see * values please see
* Documentation/networking/ip-sysctl.rst * Documentation/networking/ip-sysctl.rst
*/ */
switch (net->ipv4.sysctl_ip_no_pmtu_disc) { switch (READ_ONCE(net->ipv4.sysctl_ip_no_pmtu_disc)) {
default: default:
net_dbg_ratelimited("%pI4: fragmentation needed and DF set\n", net_dbg_ratelimited("%pI4: fragmentation needed and DF set\n",
&iph->daddr); &iph->daddr);
......
...@@ -225,7 +225,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, ...@@ -225,7 +225,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
inet->mc_list = NULL; inet->mc_list = NULL;
inet->rcv_tos = 0; inet->rcv_tos = 0;
if (net->ipv4.sysctl_ip_no_pmtu_disc) if (READ_ONCE(net->ipv4.sysctl_ip_no_pmtu_disc))
inet->pmtudisc = IP_PMTUDISC_DONT; inet->pmtudisc = IP_PMTUDISC_DONT;
else else
inet->pmtudisc = IP_PMTUDISC_WANT; inet->pmtudisc = IP_PMTUDISC_WANT;
......
...@@ -2566,7 +2566,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) ...@@ -2566,7 +2566,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)
int err; int err;
if (family == AF_INET && if (family == AF_INET &&
xs_net(x)->ipv4.sysctl_ip_no_pmtu_disc) READ_ONCE(xs_net(x)->ipv4.sysctl_ip_no_pmtu_disc))
x->props.flags |= XFRM_STATE_NOPMTUDISC; x->props.flags |= XFRM_STATE_NOPMTUDISC;
err = -EPROTONOSUPPORT; err = -EPROTONOSUPPORT;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册