diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-09-21 14:42:04 +0200 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-12-01 19:15:27 -0500 |
| commit | 9eb92f3c809dc512887a104cb16c09519405c3c0 (patch) | |
| tree | a2af3350181bc62873d386270731df9457a074af | |
| parent | a9f389fb25763384a9874cdccd14d1ada7f9517a (diff) | |
net: use trylock in icmp_sk
The locking path can be recursive (same as for sk->sk_lock.slock) and
therefore we need a trylock version for the locallock, too.
Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | net/ipv4/icmp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index e6864ff11352..330224ef4174 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -219,7 +219,11 @@ static inline struct sock *icmp_xmit_lock(struct net *net) local_bh_disable(); - local_lock(icmp_sk_lock); + if (!local_trylock(icmp_sk_lock)) { + local_bh_enable(); + return NULL; + } + sk = icmp_sk(net); if (unlikely(!spin_trylock(&sk->sk_lock.slock))) { |