Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33db9fd4 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: pblk: fix memory leak on error path 



When write recovery fails, Free memory for the recovery structure.

Fixes: a4bd217b "lightnvm: physical block device (pblk) target"

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Reviewed-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f3236cef

drivers/lightnvm/pblk-write.c

+3 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) 
		/* Logic error */

		if (bit > c_ctx->nr_valid) {

			WARN_ONCE(1, "pblk: corrupted write request\n");

			mempool_free(recovery, pblk->rec_pool);

			goto out;

		}
@@ -149,6 +150,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) 
		entry = pblk_rb_sync_scan_entry(&pblk->rwb, &ppa);

		if (!entry) {

			pr_err("pblk: could not scan entry on write failure\n");

			mempool_free(recovery, pblk->rec_pool);

			goto out;

		}
@@ -162,6 +164,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) 
	ret = pblk_recov_setup_rq(pblk, c_ctx, recovery, comp_bits, c_entries);

	if (ret) {

		pr_err("pblk: could not recover from write failure\n");

		mempool_free(recovery, pblk->rec_pool);

		goto out;

	}