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

Commit 8bc1f687 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Greg Kroah-Hartman
Browse files

icmp: Fix a data-race around sysctl_icmp_ratelimit. 



[ Upstream commit 2a4eb714841f288cf51c7d942d98af6a8c6e4b01 ]

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

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 3093a6fe

net/ipv4/icmp.c

+2 −1
Original line number Diff line number Diff line
@@ -328,7 +328,8 @@ static bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt, 


	vif = l3mdev_master_ifindex(dst->dev);

	peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, vif, 1);

	rc = inet_peer_xrlim_allow(peer, net->ipv4.sysctl_icmp_ratelimit);

	rc = inet_peer_xrlim_allow(peer,

				   READ_ONCE(net->ipv4.sysctl_icmp_ratelimit));

	if (peer)

		inet_putpeer(peer);

out: