From: "Matias Bjørling" <m@bjorling.me>
To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com
Cc: "Matias Bjørling" <m@bjorling.me>
Subject: [PATCH 06/28] lightnvm: avoid memory leak when lun_map kcalloc fails
Date: Fri, 6 May 2016 20:02:59 +0200 [thread overview]
Message-ID: <1462557801-24974-7-git-send-email-m@bjorling.me> (raw)
In-Reply-To: <1462557801-24974-1-git-send-email-m@bjorling.me>
A memory leak occurs if the lower page table is initialized and the
following dev->lun_map fails on allocation.
Rearrange the initialization of lower page table to allow dev->lun_map
to fail gracefully without memory leak.
Reviewed by: Johannes Thumshirn <jthumshirn@suse.de>
Move kfree of dev->lun_map to nvm_free()
Signed-off-by: Matias Bjørling <m@bjorling.me>
---
drivers/lightnvm/core.c | 53 ++++++++++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 23 deletions(-)
diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 4cadbe0..74fb049 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -504,6 +504,7 @@ static int nvm_core_init(struct nvm_dev *dev)
{
struct nvm_id *id = &dev->identity;
struct nvm_id_group *grp = &id->groups[0];
+ int ret;
/* device values */
dev->nr_chnls = grp->num_ch;
@@ -522,33 +523,16 @@ static int nvm_core_init(struct nvm_dev *dev)
dev->plane_mode = NVM_PLANE_SINGLE;
dev->max_rq_size = dev->ops->max_phys_sect * dev->sec_size;
- if (grp->mtype != 0) {
- pr_err("nvm: memory type not supported\n");
- return -EINVAL;
- }
-
- switch (grp->fmtype) {
- case NVM_ID_FMTYPE_SLC:
- if (nvm_init_slc_tbl(dev, grp))
- return -ENOMEM;
- break;
- case NVM_ID_FMTYPE_MLC:
- if (nvm_init_mlc_tbl(dev, grp))
- return -ENOMEM;
- break;
- default:
- pr_err("nvm: flash type not supported\n");
- return -EINVAL;
- }
-
- if (!dev->lps_per_blk)
- pr_info("nvm: lower page programming table missing\n");
-
if (grp->mpos & 0x020202)
dev->plane_mode = NVM_PLANE_DOUBLE;
if (grp->mpos & 0x040404)
dev->plane_mode = NVM_PLANE_QUAD;
+ if (grp->mtype != 0) {
+ pr_err("nvm: memory type not supported\n");
+ return -EINVAL;
+ }
+
/* calculated values */
dev->sec_per_pl = dev->sec_per_pg * dev->nr_planes;
dev->sec_per_blk = dev->sec_per_pl * dev->pgs_per_blk;
@@ -560,11 +544,34 @@ static int nvm_core_init(struct nvm_dev *dev)
sizeof(unsigned long), GFP_KERNEL);
if (!dev->lun_map)
return -ENOMEM;
+
+ switch (grp->fmtype) {
+ case NVM_ID_FMTYPE_SLC:
+ if (nvm_init_slc_tbl(dev, grp)) {
+ ret = -ENOMEM;
+ goto err_fmtype;
+ }
+ break;
+ case NVM_ID_FMTYPE_MLC:
+ if (nvm_init_mlc_tbl(dev, grp)) {
+ ret = -ENOMEM;
+ goto err_fmtype;
+ }
+ break;
+ default:
+ pr_err("nvm: flash type not supported\n");
+ ret = -EINVAL;
+ goto err_fmtype;
+ }
+
INIT_LIST_HEAD(&dev->online_targets);
mutex_init(&dev->mlock);
spin_lock_init(&dev->lock);
return 0;
+err_fmtype:
+ kfree(dev->lun_map);
+ return ret;
}
static void nvm_free(struct nvm_dev *dev)
@@ -576,6 +583,7 @@ static void nvm_free(struct nvm_dev *dev)
dev->mt->unregister_mgr(dev);
kfree(dev->lptbl);
+ kfree(dev->lun_map);
}
static int nvm_init(struct nvm_dev *dev)
@@ -705,7 +713,6 @@ void nvm_unregister(char *disk_name)
up_write(&nvm_lock);
nvm_exit(dev);
- kfree(dev->lun_map);
kfree(dev);
}
EXPORT_SYMBOL(nvm_unregister);
--
2.1.4
next prev parent reply other threads:[~2016-05-06 18:11 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-06 18:02 [PATCH 00/28] LightNVM fixes for 4.7 Matias Bjørling
2016-05-06 18:02 ` [PATCH 01/28] lightnvm: fix "warning: ‘ret’ may be used uninitialized" Matias Bjørling
2016-05-06 18:02 ` [PATCH 02/28] lightnvm: handle submit_io failure Matias Bjørling
2016-05-06 18:02 ` [PATCH 03/28] lightnvm: implement nvm_submit_ppa_list Matias Bjørling
2016-05-06 18:02 ` [PATCH 04/28] lightnvm: add fpg_size and pfpg_size to struct nvm_dev Matias Bjørling
2016-05-06 18:02 ` [PATCH 05/28] lightnvm: move block fold outside of get_bb_tbl() Matias Bjørling
2016-05-06 18:02 ` Matias Bjørling [this message]
2016-05-06 18:03 ` [PATCH 07/28] lightnvm: calculate rrpc total blocks and sectors up front Matias Bjørling
2016-05-06 18:03 ` [PATCH 08/28] lightnvm: store rrpc->soffset in device sector size Matias Bjørling
2016-05-06 18:03 ` [PATCH 09/28] lightnvm: rename nvm_targets to nvm_tgt_type Matias Bjørling
2016-05-06 18:03 ` [PATCH 10/28] lightnvm: refactor dev->online_target to global nvm_targets Matias Bjørling
2016-05-06 18:03 ` [PATCH 11/28] lightnvm: introduce nvm_for_each_lun_ppa() macro Matias Bjørling
2016-05-06 18:03 ` [PATCH 12/28] lightnvm: refactor device ops->get_bb_tbl() Matias Bjørling
2016-05-06 18:03 ` [PATCH 13/28] lightnvm: remove struct factory_blks Matias Bjørling
2016-05-06 18:03 ` [PATCH 14/28] lightnvm: make nvm_set_rqd_ppalist() aware of vblks Matias Bjørling
2016-05-06 18:03 ` [PATCH 15/28] lightnvm: move responsibility for bad blk mgmt to target Matias Bjørling
2016-05-06 18:03 ` [PATCH 16/28] lightnvm: refactor set_bb_tbl for accepting ppa list Matias Bjørling
2016-05-06 18:03 ` [PATCH 17/28] lightnvm: fix out of bound ppa lun id on bb tbl Matias Bjørling
2016-05-06 18:03 ` [PATCH 18/28] lightnvm: do not free unused metadata on rrpc Matias Bjørling
2016-05-06 18:03 ` [PATCH 19/28] lightnvm: enable metadata to be sent to device Matias Bjørling
2016-05-06 18:03 ` [PATCH 20/28] lightnvm: rename dma helper functions Matias Bjørling
2016-05-06 18:03 ` [PATCH 21/28] nvme/lightnvm: Log using the ctrl named device Matias Bjørling
2016-05-06 18:03 ` [PATCH 22/28] lightnvm: do not assume sequential lun alloc Matias Bjørling
2016-05-06 18:03 ` [PATCH 23/28] lightnvm: pass dma address to hardware rather than pointer Matias Bjørling
2016-05-06 18:03 ` [PATCH 24/28] lightnvm: remove mgt targets on mgt removal Matias Bjørling
2016-05-06 18:03 ` [PATCH 25/28] lightnvm: expose gennvm_mark_blk to targets Matias Bjørling
2016-05-06 18:03 ` [PATCH 26/28] lightnvm: add is_cached entry to struct ppa_addr Matias Bjørling
2016-05-06 18:03 ` [PATCH 27/28] lightnvm: rename nr_pages to nr_ppas on nvm_rq Matias Bjørling
2016-05-06 18:03 ` [PATCH 28/28] lightnvm: reserved space calculation incorrect Matias Bjørling
2016-05-10 14:43 ` [PATCH 00/28] LightNVM fixes for 4.7 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=1462557801-24974-7-git-send-email-m@bjorling.me \
--to=m@bjorling.me \
--cc=axboe@fb.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).