Commit 5136a4fd authored Apr 25, 2017 by Wei Yongjun Committed by Jens Axboe Apr 25, 2017

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: a4bd217b ("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>

parent 543b334d

drivers/lightnvm/pblk-init.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);		nr_blks = nvm_bb_tbl_fold(dev->parent, blks, nr_blks);
	if (nr_blks < 0) {		if (nr_blks < 0) {
	kfree(blks);
	ret = nr_blks;		ret = nr_blks;
			goto out;
	}		}

	rlun->bb_list = blks;		rlun->bb_list = blks;

			return 0;
	out:		out:
			kfree(blks);
	return ret;		return ret;
	}		}