diff options
| author | Michael S. Tsirkin <mst@mellanox.co.il> | 2006-01-11 11:47:34 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2006-01-11 11:47:34 -0800 |
| commit | 78bfe0b5b67fe126ed98608e42e42fb6ed9aabd4 (patch) | |
| tree | ec595bf181906edbff10b93170b4b814fab60ad7 /drivers/infiniband/ulp | |
| parent | 97460df37ea3335ca11562568932c9f9facfecdb (diff) | |
| download | op-kernel-dev-78bfe0b5b67fe126ed98608e42e42fb6ed9aabd4.zip op-kernel-dev-78bfe0b5b67fe126ed98608e42e42fb6ed9aabd4.tar.gz | |
IPoIB: Take dev->xmit_lock around mc_list accesses
dev->mc_list accesses must be protected by dev->xmit_lock.
Found by Eli Cohen <eli@mellanox.co.il>.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index 03b2ca6..bf1c08c 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -827,7 +827,8 @@ void ipoib_mcast_restart_task(void *dev_ptr) ipoib_mcast_stop_thread(dev, 0); - spin_lock_irqsave(&priv->lock, flags); + spin_lock_irqsave(&dev->xmit_lock, flags); + spin_lock(&priv->lock); /* * Unfortunately, the networking core only gives us a list of all of @@ -899,7 +900,9 @@ void ipoib_mcast_restart_task(void *dev_ptr) list_add_tail(&mcast->list, &remove_list); } } - spin_unlock_irqrestore(&priv->lock, flags); + + spin_unlock(&priv->lock); + spin_unlock_irqrestore(&dev->xmit_lock, flags); /* We have to cancel outside of the spinlock */ list_for_each_entry_safe(mcast, tmcast, &remove_list, list) { |
