diff options
| author |   Alan Stern <stern@rowland.harvard.edu> | 2010-02-12 12:13:31 -0500 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@suse.de> | 2010-02-18 10:52:10 -0600 |
| commit | 75f8ee8e01a6c96652f27da40d4bdac9e2e485f0 (patch) | |
| tree | 0052eea0bf0ad22577c0ef1e89f9a4297b05e96a /drivers/scsi/scsi_scan.c | |
| parent | [SCSI] lpfc: correct PPC build failure (diff) | |
| download | linux-dev-75f8ee8e01a6c96652f27da40d4bdac9e2e485f0.tar.xz linux-dev-75f8ee8e01a6c96652f27da40d4bdac9e2e485f0.zip | |
[SCSI] fix memory leak in scsi_report_lun_scan
This patch (as1333) fixes a bug in scsi_report_lun_scan(). If a
newly-allocated device can't be used, it should be deleted.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 012f73a96880..60b262d66b5b 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1339,8 +1339,10 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, sdev = scsi_alloc_sdev(starget, 0, NULL); if (!sdev) return 0; - if (scsi_device_get(sdev)) + if (scsi_device_get(sdev)) { + __scsi_remove_device(sdev); return 0; + } } sprintf(devname, "host %d channel %d id %d", |