2018-06-05 15:16:42

by Colin King

Subject: [PATCH][next] lightnvm: pblk: fix resource leak of invalid_bitmap

From: Colin Ian King <[email protected]>

Currently the error exit path when the emeta could not be
interpreted is via fail_free_ws and this fails to free
invalid_bitmap. Fix this by adding another exit label and
exiting via this to kfree invalid_bitmap.

Detected by CoverityScan, CID#1469659 ("Resource leak")

Fixes: 48b8d20895f8 ("lightnvm: pblk: garbage collect lines with failed writes")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/lightnvm/pblk-gc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/lightnvm/pblk-gc.c b/drivers/lightnvm/pblk-gc.c
index df88f1bdd921..31a0a1b3868b 100644
--- a/drivers/lightnvm/pblk-gc.c
+++ b/drivers/lightnvm/pblk-gc.c
@@ -203,7 +203,7 @@ static void pblk_gc_line_prepare_ws(struct work_struct *work)
if (!lba_list) {
pr_err("pblk: could not interpret emeta (line %d)\n",
line->id);
- goto fail_free_ws;
+ goto fail_free_invalid_bitmap;
}
}

@@ -280,6 +280,7 @@ static void pblk_gc_line_prepare_ws(struct work_struct *work)
kfree(gc_rq);
fail_free_lba_list:
pblk_mfree(lba_list, l_mg->emeta_alloc_type);
+fail_free_invalid_bitmap:
kfree(invalid_bitmap);
fail_free_ws:
kfree(line_ws);
--
2.17.0

2018-06-05 15:22:48

by Jens Axboe

Subject: Re: [PATCH][next] lightnvm: pblk: fix resource leak of invalid_bitmap

On 6/5/18 9:14 AM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Currently the error exit path when the emeta could not be
> interpreted is via fail_free_ws and this fails to free
> invalid_bitmap. Fix this by adding another exit label and
> exiting via this to kfree invalid_bitmap.
>
> Detected by CoverityScan, CID#1469659 ("Resource leak")

Looks good, applied.

--
Jens Axboe