Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5af6d922 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Greg Kroah-Hartman
Browse files

ip: Fix data-races around sysctl_ip_no_pmtu_disc. 



[ Upstream commit 0968d2a441bf6afb551fd99e60fa65ed67068963 ]

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: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 16cb6717

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int inet_create(struct net *net, struct socket *sock, int protocol, 
			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;

	else

		inet->pmtudisc = IP_PMTUDISC_WANT;

net/ipv4/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ static bool icmp_unreach(struct sk_buff *skb) 
			 * values please see

			 * Documentation/networking/ip-sysctl.txt

			 */

			switch (net->ipv4.sysctl_ip_no_pmtu_disc) {

			switch (READ_ONCE(net->ipv4.sysctl_ip_no_pmtu_disc)) {

			default:

				net_dbg_ratelimited("%pI4: fragmentation needed and DF set\n",

						    &iph->daddr);

net/ipv6/af_inet6.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, 
	inet->mc_list	= NULL;

	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;

	else

		inet->pmtudisc = IP_PMTUDISC_WANT;

net/xfrm/xfrm_state.c

+1 −1
Original line number Diff line number Diff line
@@ -2488,7 +2488,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) 
	int err;



	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;



	err = -EPROTONOSUPPORT;