[SCSI] sym53c8xx: fix shost use-after-free and memory leak

This patch fixes two bugs:

1) rmmod sym53c8xx uses shost after freeing it with
   scsi_put_host(shost).

2) insmod sym53c8xx doesn't call scsi_put_host(shost) if
   scsi_add_host() fails, causing a memory leak on the error path.

Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index f4e6cde1fd0d5ed132723e57bfabac9c261f54cd..ff5be958d3d33b4f8c6abd26dacb84bff348cd1c 100644 (file)
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -1660,6 +1660,7 @@ static int sym_detach(struct Scsi_Host *shost, struct pci_dev *pdev)
        OUTB(np, nc_istat, 0);
 
        sym_free_resources(np, pdev);
+       scsi_host_put(shost);
 
        return 1;
 }
@@ -1749,7 +1750,6 @@ static void sym2_remove(struct pci_dev *pdev)
        struct Scsi_Host *shost = pci_get_drvdata(pdev);
 
        scsi_remove_host(shost);
-       scsi_host_put(shost);
        sym_detach(shost, pdev);
        pci_release_regions(pdev);
        pci_disable_device(pdev);