diff options
| author |   Roland Dreier <roland@purestorage.com> | 2011-11-30 17:14:22 -0800 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2011-12-15 10:57:40 +0400 |
| commit | c24a1710d18d706ee2bbd87390868242f1a6d8d5 (patch) | |
| tree | 685567836441bdbdcb99d960188adbc7eee80e6a /drivers/scsi/mpt2sas | |
| parent | [SCSI] mpt2sas : Bump driver vesion to 12.100.00.00 (diff) | |
| download | linux-dev-c24a1710d18d706ee2bbd87390868242f1a6d8d5.tar.xz linux-dev-c24a1710d18d706ee2bbd87390868242f1a6d8d5.zip | |
[SCSI] mpt2sas: Fix leak on mpt2sas_base_attach() error path
Commit 911ae9434f83 ("[SCSI] mpt2sas: Added NUNA IO support in driver
which uses multi-reply queue support of the HBA") added new
allocations to the beginning of mpt2sas_base_attach(), which means
directly returning an error on failure of mpt2sas_base_map_resources()
will leak those allocations.
Fix this by doing "goto out_free_resources" in this place too, as the
rest of the function does.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Acked-by: "Nandigama, Nagalakshmi" <Nagalakshmi.Nandigama@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mpt2sas')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 961b11ea8c04..65c377dc0279 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c @@ -4256,7 +4256,7 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) r = mpt2sas_base_map_resources(ioc); if (r) - return r; + goto out_free_resources; if (ioc->is_warpdrive) { ioc->reply_post_host_index[0] = |