diff options
| author | Joe Lawrence | 2014-08-26 23:10:41 +0200 |
|---|---|---|
| committer | Christoph Hellwig | 2014-09-16 18:09:58 +0200 |
| commit | db7157d4cfce6edf052452fb1d327d4d11b67f4c (patch) | |
| tree | b254432fc2e790ee5ef859e886348b0784884561 /drivers/scsi/qla2xxx/qla_os.c | |
| parent | pmcraid: Use pci_enable_msix_range() instead of pci_enable_msix() (diff) | |
| download | kernel-qcow2-linux-db7157d4cfce6edf052452fb1d327d4d11b67f4c.tar.gz kernel-qcow2-linux-db7157d4cfce6edf052452fb1d327d4d11b67f4c.tar.xz kernel-qcow2-linux-db7157d4cfce6edf052452fb1d327d4d11b67f4c.zip | |
qla2xxx: Fix shost use-after-free on device removal
Once calling scsi_host_put, be careful to not access qla_hw_data through
the Scsi_Host private data (ie, scsi_qla_host base_vha).
Fixes: fe1b806f4f71 ("qla2xxx: Refactor shutdown code so some functionality can be reused")
Cc: stable@vger.kernel.org # 3.14, 3.15, 3.16
Signed-off-by: Joe Lawrence <joe.lawrence@stratus.com>
Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index be9698d920c2..8252c0e6682c 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -3119,10 +3119,8 @@ qla2x00_unmap_iobases(struct qla_hw_data *ha) } static void -qla2x00_clear_drv_active(scsi_qla_host_t *vha) +qla2x00_clear_drv_active(struct qla_hw_data *ha) { - struct qla_hw_data *ha = vha->hw; - if (IS_QLA8044(ha)) { qla8044_idc_lock(ha); qla8044_clear_drv_active(ha); @@ -3193,7 +3191,7 @@ qla2x00_remove_one(struct pci_dev *pdev) scsi_host_put(base_vha->host); - qla2x00_clear_drv_active(base_vha); + qla2x00_clear_drv_active(ha); qla2x00_unmap_iobases(ha); |