diff options
| author |   Yevgeny Petrilin <yevgenyp@mellanox.co.il> | 2009-09-05 20:24:49 -0700 |
|---|---|---|
| committer |   Roland Dreier <rolandd@cisco.com> | 2009-09-05 20:24:49 -0700 |
| commit | 1af92e2a211b0d46ef60ea9f30f989fd7b5725fa (patch) | |
| tree | ee52c5a1a7fc3e78b0bd1e4c317f98959b4b7ea7 /drivers/net/mlx4 | |
| parent | mlx4_core: Allocate and map sufficient ICM memory for EQ context (diff) | |
| download | linux-dev-1af92e2a211b0d46ef60ea9f30f989fd7b5725fa.tar.xz linux-dev-1af92e2a211b0d46ef60ea9f30f989fd7b5725fa.zip | |
mlx4_core: Avoid double free_icms
On the error path of mlx4_init_hca(), mlx4_close_hca() is called,
followed by mlx4_free_icms() and mlx4_UNMAP_FA(). But both those
functions are also called from mlx4_close_hca(), which leads to a
double free.
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/net/mlx4')
| -rw-r--r-- | drivers/net/mlx4/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 528f89b2cde3..3dd481e77f92 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c @@ -789,7 +789,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev) return 0; err_close: - mlx4_close_hca(dev); + mlx4_CLOSE_HCA(dev, 0); err_free_icm: mlx4_free_icms(dev); |