Commit c1480ad5 authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe

lightnvm: prevent double free on init error

Both the nvm_register and nvm_init does a kfree(dev) on error. Make sure
to only free it once.
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent edad2e66
...@@ -160,11 +160,6 @@ int nvm_erase_blk(struct nvm_dev *dev, struct nvm_block *blk) ...@@ -160,11 +160,6 @@ int nvm_erase_blk(struct nvm_dev *dev, struct nvm_block *blk)
} }
EXPORT_SYMBOL(nvm_erase_blk); EXPORT_SYMBOL(nvm_erase_blk);
static void nvm_core_free(struct nvm_dev *dev)
{
kfree(dev);
}
static int nvm_core_init(struct nvm_dev *dev) static int nvm_core_init(struct nvm_dev *dev)
{ {
struct nvm_id *id = &dev->identity; struct nvm_id *id = &dev->identity;
...@@ -223,8 +218,6 @@ static void nvm_free(struct nvm_dev *dev) ...@@ -223,8 +218,6 @@ static void nvm_free(struct nvm_dev *dev)
if (dev->mt) if (dev->mt)
dev->mt->unregister_mgr(dev); dev->mt->unregister_mgr(dev);
nvm_core_free(dev);
} }
static int nvm_init(struct nvm_dev *dev) static int nvm_init(struct nvm_dev *dev)
...@@ -351,11 +344,12 @@ void nvm_unregister(char *disk_name) ...@@ -351,11 +344,12 @@ void nvm_unregister(char *disk_name)
return; return;
} }
nvm_exit(dev);
down_write(&nvm_lock); down_write(&nvm_lock);
list_del(&dev->devices); list_del(&dev->devices);
up_write(&nvm_lock); up_write(&nvm_lock);
nvm_exit(dev);
kfree(dev);
} }
EXPORT_SYMBOL(nvm_unregister); EXPORT_SYMBOL(nvm_unregister);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment