diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2017-04-25 16:15:30 +0000 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2017-04-25 10:44:29 -0600 |
| commit | 5136a4fd5832af12ec5e5961c52a27a524a0a9d9 (patch) | |
| tree | 0797e62df77407cf16ff995ab1d2d2d008fd45a0 /drivers/lightnvm | |
| parent | virtio_blk: Fix English description of VIRTIO_BLK_SCSI (diff) | |
| download | linux-dev-5136a4fd5832af12ec5e5961c52a27a524a0a9d9.tar.xz linux-dev-5136a4fd5832af12ec5e5961c52a27a524a0a9d9.zip | |
lightnvm: fix possible memory leak in pblk_bb_discovery()
'blks' is malloced in pblk_bb_discovery() and should be freed
before leaving from the nvm_get_tgt_bb_tbl() error handling cases,
otherwise it will cause memory leak. Also skip assign blks to
rlun->bb_list when error.
Fixes: a4bd217b4326 ("lightnvm: physical block device (pblk) target")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/lightnvm')
| -rw-r--r-- | drivers/lightnvm/pblk-init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c index 15b2787c3ddc..ae8cd6d5af8b 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -399,13 +399,15 @@ static int pblk_bb_discovery(struct nvm_tgt_dev *dev, struct pblk_lun *rlun) nr_blks = nvm_bb_tbl_fold(dev->parent, blks, nr_blks); if (nr_blks < 0) { - kfree(blks); ret = nr_blks; + goto out; } rlun->bb_list = blks; + return 0; out: + kfree(blks); return ret; } |