From: "Matias Bjørling" <m@bjorling.me>
To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com
Cc: hch@infradead.org, keith.busch@intel.com,
sudipm.mukherjee@gmail.com, ww.tao0320@gmail.com,
"Matias Bjørling" <m@bjorling.me>
Subject: [PATCH 2/7] lightnvm: free memory when gennvm register fails
Date: Sat, 28 Nov 2015 16:49:23 +0100 [thread overview]
Message-ID: <1448725768-11992-3-git-send-email-m@bjorling.me> (raw)
In-Reply-To: <1448725768-11992-1-git-send-email-m@bjorling.me>
From: Wenwei Tao <ww.tao0320@gmail.com>
free allocated nvm block and gennvm lun structures when
gennvm register fails, otherwise it will cause memory leak.
Signed-off-by: Matias Bjørling <m@bjorling.me>
---
drivers/lightnvm/gennvm.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index e20e74e..3969a98 100644
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -207,6 +207,14 @@ static int gennvm_blocks_init(struct nvm_dev *dev, struct gen_nvm *gn)
return 0;
}
+static void gennvm_free(struct nvm_dev *dev)
+{
+ gennvm_blocks_free(dev);
+ gennvm_luns_free(dev);
+ kfree(dev->mp);
+ dev->mp = NULL;
+}
+
static int gennvm_register(struct nvm_dev *dev)
{
struct gen_nvm *gn;
@@ -234,16 +242,13 @@ static int gennvm_register(struct nvm_dev *dev)
return 1;
err:
- kfree(gn);
+ gennvm_free(dev);
return ret;
}
static void gennvm_unregister(struct nvm_dev *dev)
{
- gennvm_blocks_free(dev);
- gennvm_luns_free(dev);
- kfree(dev->mp);
- dev->mp = NULL;
+ gennvm_free(dev);
}
static struct nvm_block *gennvm_get_blk(struct nvm_dev *dev,
--
2.1.4
next prev parent reply other threads:[~2015-11-28 15:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-28 15:49 [PATCH 0/7] Fixes for LightNVM Matias Bjørling
2015-11-28 15:49 ` [PATCH 1/7] lightnvm: Simplify config when disabled Matias Bjørling
2015-11-28 15:49 ` Matias Bjørling [this message]
2015-11-28 15:49 ` [PATCH 3/7] lightnvm: fix ioctl memory leaks Matias Bjørling
2015-11-28 15:49 ` [PATCH 4/7] lightnvm: do device max sectors boundary check first Matias Bjørling
2015-11-28 15:49 ` [PATCH 5/7] lightnvm: refactor and change vendor id for qemu Matias Bjørling
2015-11-28 15:49 ` [PATCH 6/7] lightnvm: unconverted ppa returned in get_bb_tbl Matias Bjørling
2015-11-28 15:49 ` [PATCH 7/7] lightnvm: missing nvm_lock acquire Matias Bjørling
2015-11-30 15:40 ` [PATCH 0/7] Fixes for LightNVM Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448725768-11992-3-git-send-email-m@bjorling.me \
--to=m@bjorling.me \
--cc=axboe@fb.com \
--cc=hch@infradead.org \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sudipm.mukherjee@gmail.com \
--cc=ww.tao0320@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®