diff options
| author |   Wenwei Tao <ww.tao0320@gmail.com> | 2015-11-28 16:49:23 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2015-11-29 14:34:57 -0700 |
| commit | 8261bd48c6c9c36cd2c2e343a69e76a3be2b04a4 (patch) | |
| tree | bc7135d65b0093ac658f0396f8391b95282d7919 /drivers/lightnvm | |
| parent | lightnvm: Simplify config when disabled (diff) | |
| download | linux-dev-8261bd48c6c9c36cd2c2e343a69e76a3be2b04a4.tar.xz linux-dev-8261bd48c6c9c36cd2c2e343a69e76a3be2b04a4.zip | |
lightnvm: free memory when gennvm register fails
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>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/lightnvm')
| -rw-r--r-- | drivers/lightnvm/gennvm.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c index e20e74ec6b91..3969a9875e59 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, |