diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-08-31 17:54:09 +0200 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-11-17 23:19:18 +0100 |
| commit | f8be692117678336f828bd2453d0bf79b8132b68 (patch) | |
| tree | c9c0f1200e1dec6d5cace8bdad7ec91052484223 /net/ipv4/icmp.c | |
| parent | d54fe2b172e77a9b7d0c279238f712cbafe4d8be (diff) | |
| download | linux-rt-f8be692117678336f828bd2453d0bf79b8132b68.tar.gz | |
net: add a lock around icmp_sk()
It looks like the this_cpu_ptr() access in icmp_sk() is protected with
local_bh_disable(). To avoid missing serialization in -RT I am adding
here a local lock. No crash has been observed, this is just precaution.
Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'net/ipv4/icmp.c')
| -rw-r--r-- | net/ipv4/icmp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 681e33998e03..54b94cefa7a5 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -77,6 +77,7 @@ #include <linux/string.h> #include <linux/netfilter_ipv4.h> #include <linux/slab.h> +#include <linux/locallock.h> #include <net/snmp.h> #include <net/ip.h> #include <net/route.h> @@ -204,6 +205,8 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1]; * * On SMP we have one ICMP socket per-cpu. */ +static DEFINE_LOCAL_IRQ_LOCK(icmp_sk_lock); + static struct sock *icmp_sk(struct net *net) { return *this_cpu_ptr(net->ipv4.icmp_sk); @@ -417,6 +420,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) /* Needed by both icmp_global_allow and icmp_xmit_lock */ local_bh_disable(); + local_lock(icmp_sk_lock); /* global icmp_msgs_per_sec */ if (!icmpv4_global_allow(net, type, code)) @@ -461,6 +465,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) out_unlock: icmp_xmit_unlock(sk); out_bh_enable: + local_unlock(icmp_sk_lock); local_bh_enable(); } @@ -656,6 +661,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) /* Needed by both icmp_global_allow and icmp_xmit_lock */ local_bh_disable(); + local_lock(icmp_sk_lock); /* Check global sysctl_icmp_msgs_per_sec ratelimit, unless * incoming dev is loopback. If outgoing dev change to not be @@ -744,6 +750,7 @@ ende: out_unlock: icmp_xmit_unlock(sk); out_bh_enable: + local_unlock(icmp_sk_lock); local_bh_enable(); out:; } |