diff options
| author | Andrey Vagin <avagin@openvz.org> | 2011-11-10 05:48:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-14 00:38:53 -0500 |
| commit | ef5e0d8237287db3a12d84f08fb2483d7a30a943 (patch) | |
| tree | 788e6c6546b4e3af7b01e0863ef4f2d8808e50ef /net/bridge/br_multicast.c | |
| parent | 731abb9cb27aef6013ce60808a04e04a545f3f4e (diff) | |
| download | lwn-ef5e0d8237287db3a12d84f08fb2483d7a30a943.tar.gz lwn-ef5e0d8237287db3a12d84f08fb2483d7a30a943.zip | |
bridge: Fix potential deadlock on br->multicast_lock
multicast_lock is taken in softirq context, so we should use
spin_lock_bh() in userspace.
call-chain in softirq context:
run_timer_softirq()
br_multicast_query_expired()
call-chain in userspace:
sysfs_write_file()
store_multicast_snooping()
br_multicast_toggle()
Signed-off-by: Andrew Vagin <avagin@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_multicast.c')
| -rw-r--r-- | net/bridge/br_multicast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 995cbe0ac0b2..2eefe275b338 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1770,7 +1770,7 @@ int br_multicast_toggle(struct net_bridge *br, unsigned long val) int err = 0; struct net_bridge_mdb_htable *mdb; - spin_lock(&br->multicast_lock); + spin_lock_bh(&br->multicast_lock); if (br->multicast_disabled == !val) goto unlock; @@ -1806,7 +1806,7 @@ rollback: } unlock: - spin_unlock(&br->multicast_lock); + spin_unlock_bh(&br->multicast_lock); return err; } |