lightnvm: pblk: fix error handling of pblk_lines_init()

Wei Yongjun · axboe · commit a70985f83c62 · 2018-10-09T08:25:08.000-06:00
In the too many bad blocks error handling case, we should release all the allocated resources, otherwise it will cause memory leak. Fixes: 2deeefc ("lightnvm: pblk: fail gracefully on line alloc. failure") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Reviewed-by: Hans Holmberg <hans.holmberg@cnexlabs.com> Signed-off-by: Matias Bjørling <mb@lightnvm.io> Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
@@ -1024,7 +1024,8 @@ static int pblk_lines_init(struct pblk *pblk)
 
 	if (!nr_free_chks) {
 		pblk_err(pblk, "too many bad blocks prevent for sane instance\n");
-		return -EINTR;
+		ret = -EINTR;
+		goto fail_free_lines;
 	}
 
 	pblk_set_provision(pblk, nr_free_chks);

Original file line number	Diff line number	Diff line change
`@@ -1024,7 +1024,8 @@ static int pblk_lines_init(struct pblk *pblk)`
`1024`	`1024`
`1025`	`1025`	`if (!nr_free_chks) {`
`1026`	`1026`	`pblk_err(pblk, "too many bad blocks prevent for sane instance\n");`
`1027`		`- return -EINTR;`
	`1027`	`+ ret = -EINTR;`
	`1028`	`+ goto fail_free_lines;`
`1028`	`1029`	`}`
`1029`	`1030`
`1030`	`1031`	`pblk_set_provision(pblk, nr_free_chks);`