From: Kuniyuki Iwashima <kuniyu@amazon.com>
Date: Tue, 12 Jul 2022 00:15:27 +0000 (-0700)
Subject: icmp: Fix a data-race around sysctl_icmp_ratelimit.
X-Git-Tag: v5.10.132~54
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4ebf26153215cbc3826d5ec57f051c3ec6c95b22;p=users%2Fdwmw2%2Flinux.git

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: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index f22c0d55f4796..9483c2a16b78d 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -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: