]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
bridge: Fix potential deadlock on br->multicast_lock
authorAndrey Vagin <avagin@openvz.org>
Thu, 10 Nov 2011 05:48:03 +0000 (05:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Nov 2011 05:38:53 +0000 (00:38 -0500)
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>
net/bridge/br_multicast.c

index 995cbe0ac0b2b1e74f2b4762d61a13102d9f66bb..2eefe275b338827968f7c62ab856d23151d7a494 100644 (file)
@@ -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;
 }