diff options
| author | Ali Ayoub <ali@mellanox.co.il> | 2007-05-17 13:58:30 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-05-19 11:51:56 -0400 |
| commit | de57c9f102ad7bdc8afa5a1560748cf4f1c18b8e (patch) | |
| tree | dccb61b8458206bac0a1c19ce0d9124ff8abd90f /drivers/infiniband | |
| parent | bd5a6ccc0e6d8eed3047b4af0e5c1e7168869cd8 (diff) | |
IB/mthca: Fix use-after-free on device restart
Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c index 773145e29947..aa563e61de65 100644 --- a/drivers/infiniband/hw/mthca/mthca_main.c +++ b/drivers/infiniband/hw/mthca/mthca_main.c | |||
| @@ -1250,12 +1250,14 @@ static void __mthca_remove_one(struct pci_dev *pdev) | |||
| 1250 | int __mthca_restart_one(struct pci_dev *pdev) | 1250 | int __mthca_restart_one(struct pci_dev *pdev) |
| 1251 | { | 1251 | { |
| 1252 | struct mthca_dev *mdev; | 1252 | struct mthca_dev *mdev; |
| 1253 | int hca_type; | ||
| 1253 | 1254 | ||
| 1254 | mdev = pci_get_drvdata(pdev); | 1255 | mdev = pci_get_drvdata(pdev); |
| 1255 | if (!mdev) | 1256 | if (!mdev) |
| 1256 | return -ENODEV; | 1257 | return -ENODEV; |
| 1258 | hca_type = mdev->hca_type; | ||
| 1257 | __mthca_remove_one(pdev); | 1259 | __mthca_remove_one(pdev); |
| 1258 | return __mthca_init_one(pdev, mdev->hca_type); | 1260 | return __mthca_init_one(pdev, hca_type); |
| 1259 | } | 1261 | } |
| 1260 | 1262 | ||
| 1261 | static int __devinit mthca_init_one(struct pci_dev *pdev, | 1263 | static int __devinit mthca_init_one(struct pci_dev *pdev, |