* [PATCH] [SCSI] mpt2sas: Fix leak on mpt2sas_base_attach() error path
@ 2011-12-01 1:14 Roland Dreier
2011-12-02 3:50 ` Nandigama, Nagalakshmi
0 siblings, 1 reply; 2+ messages in thread
From: Roland Dreier @ 2011-12-01 1:14 UTC (permalink / raw)
To: James E.J. Bottomley; +Cc: Nagalakshmi Nandigama, linux-scsi
From: Roland Dreier <roland@purestorage.com>
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>
---
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 beda04a..a7b2a16 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -4206,7 +4206,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] =
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* RE: [PATCH] [SCSI] mpt2sas: Fix leak on mpt2sas_base_attach() error path
2011-12-01 1:14 [PATCH] [SCSI] mpt2sas: Fix leak on mpt2sas_base_attach() error path Roland Dreier
@ 2011-12-02 3:50 ` Nandigama, Nagalakshmi
0 siblings, 0 replies; 2+ messages in thread
From: Nandigama, Nagalakshmi @ 2011-12-02 3:50 UTC (permalink / raw)
To: Roland Dreier, James Bottomley; +Cc: linux-scsi@vger.kernel.org
This patch seem to be fine.
Please consider this patch as acked by me.
Regards,
Nagalakshmi
-----Original Message-----
From: Roland Dreier [mailto:roland@purestorage.com] On Behalf Of Roland Dreier
Sent: Thursday, December 01, 2011 6:44 AM
To: James E.J. Bottomley
Cc: Nandigama, Nagalakshmi; linux-scsi@vger.kernel.org
Subject: [PATCH] [SCSI] mpt2sas: Fix leak on mpt2sas_base_attach() error path
From: Roland Dreier <roland@purestorage.com>
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>
---
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 beda04a..a7b2a16 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -4206,7 +4206,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] =
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-02 3:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-01 1:14 [PATCH] [SCSI] mpt2sas: Fix leak on mpt2sas_base_attach() error path Roland Dreier
2011-12-02 3:50 ` Nandigama, Nagalakshmi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).