linux-kernel - [PATCH] mtd: nand: fix memory leak on ep on error exit returns

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]

Date:   Wed, 13 Dec 2017 20:49:09 +0000
From:   Colin King <colin.king@...onical.com>
To:     Boris Brezillon <boris.brezillon@...e-electrons.com>,
        Richard Weinberger <richard@....at>,
        David Woodhouse <dwmw2@...radead.org>,
        Brian Norris <computersforpeace@...il.com>,
        Marek Vasut <marek.vasut@...il.com>,
        Cyrille Pitchen <cyrille.pitchen@...ev4u.fr>,
        linux-mtd@...ts.infradead.org
Cc:     kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] mtd: nand: fix memory leak on ep on error exit returns

From: Colin Ian King <colin.king@...onical.com>

There are two error return paths that are not kfree'ing ep that
lead to memory leaks.  Fix this by exiting on error via the
ext_out exit path that performs the necessary kfree.

Detected by CoverityScan, CID#1462747 ("Resource Leak")

Fixes: b83ea87958c5 ("mtd: nand: provide several helpers to do common NAND operations")
Signed-off-by: Colin Ian King <colin.king@...onical.com>
---
 drivers/mtd/nand/nand_base.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index eb810d5d44e7..1c5126d1db8c 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -5046,14 +5046,14 @@ static int nand_flash_detect_ext_param_page(struct nand_chip *chip,
 	/* Send our own NAND_CMD_PARAM. */
 	ret = nand_read_param_page_op(chip, 0, NULL, 0);
 	if (ret)
-		return ret;
+		goto ext_out;
 
 	/* Use the Change Read Column command to skip the ONFI param pages. */
 	ret = nand_change_read_column_op(chip,
 					 sizeof(*p) * p->num_of_param_pages,
 					 ep, len, true);
 	if (ret)
-		return ret;
+		goto ext_out;
 
 	ret = -EINVAL;
 	if ((onfi_crc16(ONFI_CRC_BASE, ((uint8_t *)ep) + 2, len - 2)
-- 
2.14.1