Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753798AbdLMVCy (ORCPT ); Wed, 13 Dec 2017 16:02:54 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:47031 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752908AbdLMVCx (ORCPT ); Wed, 13 Dec 2017 16:02:53 -0500 Date: Wed, 13 Dec 2017 22:02:41 +0100 From: Boris Brezillon To: Colin King Cc: Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , linux-mtd@lists.infradead.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mtd: nand: fix memory leak on ep on error exit returns Message-ID: <20171213220241.29bbe131@bbrezillon> In-Reply-To: <20171213204909.28287-1-colin.king@canonical.com> References: <20171213204909.28287-1-colin.king@canonical.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1651 Lines: 53 Hi Colin, On Wed, 13 Dec 2017 20:49:09 +0000 Colin King wrote: > From: Colin Ian King > > 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. Well, given that no one implements the ->exec_op() hook yet, the xxxx_op() functions always return 0 right now, but I agree, we should fix the generic case. > > 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 If you don't mind, I'd like to squash these changes in the original commit. Thanks, Boris > --- > 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)