Browse Source

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>
Michael S. Tsirkin 19 years ago
parent
commit
78bfe0b5b6
1 changed files with 5 additions and 2 deletions
  1. 5 2
      drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+ 5 - 2
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);
 	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
 	 * 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);
 			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 */
 	/* We have to cancel outside of the spinlock */
 	list_for_each_entry_safe(mcast, tmcast, &remove_list, list) {
 	list_for_each_entry_safe(mcast, tmcast, &remove_list, list) {