linux-kernel - [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170920195019.GA25759@dhcp-216.srv.tuxera.com>
Date:   Wed, 20 Sep 2017 22:50:21 +0300
From:   Rakesh Pandit <rakesh@...era.com>
To:     Matias Bjørling <mb@...htnvm.io>,
        <linux-block@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC:     Javier González <jg@...htnvm.io>
Subject: [PATCH] lightnvm: pblk: fix error path in pblk_lines_alloc_metadata

Use appropriate memory free calls based on allocation type used and
also fix number of times free is called if kmalloc fails.

Signed-off-by: Rakesh Pandit <rakesh@...era.com>
---
 drivers/lightnvm/pblk-init.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index 7cf4b53..470ef04 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -624,12 +624,16 @@ static int pblk_lines_alloc_metadata(struct pblk *pblk)
 
 fail_free_emeta:
 	while (--i >= 0) {
-		vfree(l_mg->eline_meta[i]->buf);
+		if (l_mg->emeta_alloc_type == PBLK_VMALLOC_META)
+			vfree(l_mg->eline_meta[i]->buf);
+		else
+			kfree(l_mg->eline_meta[i]->buf);
 		kfree(l_mg->eline_meta[i]);
 	}
 
+	i = PBLK_DATA_LINES;
 fail_free_smeta:
-	for (i = 0; i < PBLK_DATA_LINES; i++)
+	while (--i >= 0)
 		kfree(l_mg->sline_meta[i]);
 
 	return -ENOMEM;
-- 
2.5.0