diff options
| author | Eli Cohen <eli@mellanox.co.il> | 2006-04-05 14:59:34 +0200 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2006-04-10 18:43:59 +0200 |
| commit | a30bb96c6f5aca6513e4dbd94962da03d14b20a9 (patch) | |
| tree | 7314d0813071b9e1b808422c96e868c26e14245a /drivers/infiniband | |
| parent | IB/mthca: Disable tuning PCI read burst size (diff) | |
| download | linux-a30bb96c6f5aca6513e4dbd94962da03d14b20a9.tar.xz linux-a30bb96c6f5aca6513e4dbd94962da03d14b20a9.zip | |
IPoIB: Close race in ipoib_flush_paths()
ib_sa_cancel_query() must be called with priv->lock held since
a completion might arrive and set path->query to NULL.
Signed-off-by: Eli Cohen <eli@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 5bf7e263454b..996c6e16a46d 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -346,14 +346,15 @@ void ipoib_flush_paths(struct net_device *dev) list_for_each_entry(path, &remove_list, list) rb_erase(&path->rb_node, &priv->path_tree); - spin_unlock_irqrestore(&priv->lock, flags); - list_for_each_entry_safe(path, tp, &remove_list, list) { if (path->query) ib_sa_cancel_query(path->query_id, path->query); + spin_unlock_irqrestore(&priv->lock, flags); wait_for_completion(&path->done); path_free(dev, path); + spin_lock_irqsave(&priv->lock, flags); } + spin_unlock_irqrestore(&priv->lock, flags); } static void path_rec_completion(int status, |