* [PATCH 1/2] nvme-rdma: fix module_init (theoretical) error path
@ 2017-03-19 4:29 Sagi Grimberg
2017-03-19 4:29 ` [PATCH 2/2] nvme-loop: " Sagi Grimberg
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Sagi Grimberg @ 2017-03-19 4:29 UTC (permalink / raw)
If nvmf_register_transport happened to fail
(it can't, but theoretically) we leak memory.
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
drivers/nvme/host/rdma.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 71d1e1a6b928..07f1b9956027 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -2068,12 +2068,20 @@ static int __init nvme_rdma_init_module(void)
return -ENOMEM;
ret = ib_register_client(&nvme_rdma_ib_client);
- if (ret) {
- destroy_workqueue(nvme_rdma_wq);
- return ret;
- }
+ if (ret)
+ goto err_destroy_wq;
+
+ ret = nvmf_register_transport(&nvme_rdma_transport);
+ if (ret)
+ goto err_unreg_client;
- return nvmf_register_transport(&nvme_rdma_transport);
+ return 0;
+
+err_unreg_client:
+ ib_unregister_client(&nvme_rdma_ib_client);
+err_destroy_wq:
+ destroy_workqueue(nvme_rdma_wq);
+ return ret;
}
static void __exit nvme_rdma_cleanup_module(void)
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] nvme-loop: fix module_init (theoretical) error path
2017-03-19 4:29 [PATCH 1/2] nvme-rdma: fix module_init (theoretical) error path Sagi Grimberg
@ 2017-03-19 4:29 ` Sagi Grimberg
2017-03-21 13:44 ` Johannes Thumshirn
2017-03-27 9:51 ` Christoph Hellwig
2017-03-21 13:43 ` [PATCH 1/2] nvme-rdma: " Johannes Thumshirn
2017-03-27 9:51 ` Christoph Hellwig
2 siblings, 2 replies; 6+ messages in thread
From: Sagi Grimberg @ 2017-03-19 4:29 UTC (permalink / raw)
if nvmf_register_transport happend to fail, we
need to nvmet_unregister_transport as well.
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
drivers/nvme/target/loop.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index 22f7bc6bac7f..7053676aa87f 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -736,7 +736,12 @@ static int __init nvme_loop_init_module(void)
ret = nvmet_register_transport(&nvme_loop_ops);
if (ret)
return ret;
- return nvmf_register_transport(&nvme_loop_transport);
+
+ ret = nvmf_register_transport(&nvme_loop_transport);
+ if (ret)
+ nvmet_unregister_transport(&nvme_loop_ops);
+
+ return ret;
}
static void __exit nvme_loop_cleanup_module(void)
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] nvme-loop: fix module_init (theoretical) error path
2017-03-19 4:29 ` [PATCH 2/2] nvme-loop: " Sagi Grimberg
@ 2017-03-21 13:44 ` Johannes Thumshirn
2017-03-27 9:51 ` Christoph Hellwig
1 sibling, 0 replies; 6+ messages in thread
From: Johannes Thumshirn @ 2017-03-21 13:44 UTC (permalink / raw)
On Sun, Mar 19, 2017@06:29:12AM +0200, Sagi Grimberg wrote:
> if nvmf_register_transport happend to fail, we
> need to nvmet_unregister_transport as well.
>
> Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
> ---
Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
--
Johannes Thumshirn Storage
jthumshirn at suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] nvme-loop: fix module_init (theoretical) error path
2017-03-19 4:29 ` [PATCH 2/2] nvme-loop: " Sagi Grimberg
2017-03-21 13:44 ` Johannes Thumshirn
@ 2017-03-27 9:51 ` Christoph Hellwig
1 sibling, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2017-03-27 9:51 UTC (permalink / raw)
Looks good,
Reviewed-by: Christoph Hellwig <hch at lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] nvme-rdma: fix module_init (theoretical) error path
2017-03-19 4:29 [PATCH 1/2] nvme-rdma: fix module_init (theoretical) error path Sagi Grimberg
2017-03-19 4:29 ` [PATCH 2/2] nvme-loop: " Sagi Grimberg
@ 2017-03-21 13:43 ` Johannes Thumshirn
2017-03-27 9:51 ` Christoph Hellwig
2 siblings, 0 replies; 6+ messages in thread
From: Johannes Thumshirn @ 2017-03-21 13:43 UTC (permalink / raw)
On Sun, Mar 19, 2017@06:29:11AM +0200, Sagi Grimberg wrote:
> If nvmf_register_transport happened to fail
> (it can't, but theoretically) we leak memory.
>
> Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
> ---
Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
--
Johannes Thumshirn Storage
jthumshirn at suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] nvme-rdma: fix module_init (theoretical) error path
2017-03-19 4:29 [PATCH 1/2] nvme-rdma: fix module_init (theoretical) error path Sagi Grimberg
2017-03-19 4:29 ` [PATCH 2/2] nvme-loop: " Sagi Grimberg
2017-03-21 13:43 ` [PATCH 1/2] nvme-rdma: " Johannes Thumshirn
@ 2017-03-27 9:51 ` Christoph Hellwig
2 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2017-03-27 9:51 UTC (permalink / raw)
Looks good,
Reviewed-by: Christoph Hellwig <hch at lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-27 9:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-19 4:29 [PATCH 1/2] nvme-rdma: fix module_init (theoretical) error path Sagi Grimberg
2017-03-19 4:29 ` [PATCH 2/2] nvme-loop: " Sagi Grimberg
2017-03-21 13:44 ` Johannes Thumshirn
2017-03-27 9:51 ` Christoph Hellwig
2017-03-21 13:43 ` [PATCH 1/2] nvme-rdma: " Johannes Thumshirn
2017-03-27 9:51 ` Christoph Hellwig
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).