diff options
| author |   Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-07-06 16:40:02 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-07-08 12:10:34 +0100 |
| commit | 48d7ee321ea5182c6a70782aa186422a70e67e22 (patch) | |
| tree | 00ac31005a3bd8dd7c3cb04c2e909c927967ee1c /net/ipv4/icmp.c | |
| parent | cipso: Fix data-races around sysctl. (diff) | |
| download | linux-dev-48d7ee321ea5182c6a70782aa186422a70e67e22.tar.xz linux-dev-48d7ee321ea5182c6a70782aa186422a70e67e22.zip | |
icmp: Fix data-races around sysctl.
While reading icmp sysctl variables, they can be changed concurrently.
So, we need to add READ_ONCE() to avoid data-races.
Fixes: 4cdf507d5452 ("icmp: add a global rate limitation")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/icmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index efea0e796f06..0f9e61d29f73 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -253,11 +253,12 @@ bool icmp_global_allow(void) spin_lock(&icmp_global.lock); delta = min_t(u32, now - icmp_global.stamp, HZ); if (delta >= HZ / 50) { - incr = sysctl_icmp_msgs_per_sec * delta / HZ ; + incr = READ_ONCE(sysctl_icmp_msgs_per_sec) * delta / HZ; if (incr) WRITE_ONCE(icmp_global.stamp, now); } - credit = min_t(u32, icmp_global.credit + incr, sysctl_icmp_msgs_burst); + credit = min_t(u32, icmp_global.credit + incr, + READ_ONCE(sysctl_icmp_msgs_burst)); if (credit) { /* We want to use a credit of one in average, but need to randomize * it for security reasons. |