From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B55CC3A59F for ; Mon, 26 Aug 2019 13:06:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D5E46217F5 for ; Mon, 26 Aug 2019 13:06:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tq0H1pt8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5E46217F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NuSxVta7njRGWl5wgGPRoZbtZLo1i9gPZolzNP2ffNk=; b=tq0H1pt8LSMtZt iRWEnDpqxWvLv66UruhwUxPwLiDoLgFmVEGWyJ17cG9x2n0OQv+ZBuLv/QC+AWBl0a9yWFo4cYUjZ HJNmKuwvNdeahUGev+KWLgyn0LkSwyLak/CgyZaokoq9NNwOA+4PWkf5mF5c2GdwemJePRVX/ufQs WM/xarfYEeMMHmMOPjGHWzU3tX3Gyew2jXZcdDNpvxuoEYePtAbjdmnk0emXycLZVKUU4PSJ/tUrs cCsAPGX413FhlnpHlmXyH5JeX/jcAS0H8jMjeMcWVf+Yx7NDzIB1jB/WuR150xiz5z2w9mw4tUOq1 dU8y7nLzFn1IqvkBwDew==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i2Eh6-0000I1-Tc; Mon, 26 Aug 2019 13:06:00 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i2Eh4-0000Hf-Hk for linux-mtd@lists.infradead.org; Mon, 26 Aug 2019 13:05:59 +0000 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id B0F8428BD6A; Mon, 26 Aug 2019 14:05:56 +0100 (BST) Date: Mon, 26 Aug 2019 15:05:53 +0200 From: Boris Brezillon To: Wenwen Wang Subject: Re: [PATCH v2] mtd: rawnand: Fix a memory leak bug Message-ID: <20190826150553.3f758c84@collabora.com> In-Reply-To: <1566182765-7150-1-git-send-email-wenwen@cs.uga.edu> References: <1566182765-7150-1-git-send-email-wenwen@cs.uga.edu> Organization: Collabora X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190826_060558_723608_40D94F02 X-CRM114-Status: GOOD ( 19.91 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kate Stewart , Vignesh Raghavendra , Boris Brezillon , Richard Weinberger , Randy Dunlap , open list , Frieder Schrempf , Marek Vasut , "open list:NAND FLASH SUBSYSTEM" , Miquel Raynal , Thomas Gleixner , Brian Norris , David Woodhouse Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org On Sun, 18 Aug 2019 21:46:04 -0500 Wenwen Wang wrote: > In nand_scan_bbt(), a temporary buffer 'buf' is allocated through > vmalloc(). However, if check_create() fails, 'buf' is not deallocated, > leading to a memory leak bug. To fix this issue, free 'buf' before > returning the error. > > Signed-off-by: Wenwen Wang > --- > drivers/mtd/nand/raw/nand_bbt.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c > index 2ef15ef..96045d6 100644 > --- a/drivers/mtd/nand/raw/nand_bbt.c > +++ b/drivers/mtd/nand/raw/nand_bbt.c > @@ -1232,7 +1232,7 @@ static int nand_scan_bbt(struct nand_chip *this, struct nand_bbt_descr *bd) > if (!td) { > if ((res = nand_memory_bbt(this, bd))) { > pr_err("nand_bbt: can't scan flash and build the RAM-based BBT\n"); > - goto err; > + goto err_free_bbt; > } > return 0; > } > @@ -1245,7 +1245,7 @@ static int nand_scan_bbt(struct nand_chip *this, struct nand_bbt_descr *bd) > buf = vmalloc(len); > if (!buf) { > res = -ENOMEM; > - goto err; > + goto err_free_bbt; > } > > /* Is the bbt at a given page? */ > @@ -1258,7 +1258,7 @@ static int nand_scan_bbt(struct nand_chip *this, struct nand_bbt_descr *bd) > > res = check_create(this, buf, bd); I know it's too late, but calling vfree(buf); here > if (res) > - goto err; > + goto err_free_buf; > > /* Prevent the bbt regions from erasing / writing */ > mark_bbt_region(this, td); > @@ -1268,7 +1268,9 @@ static int nand_scan_bbt(struct nand_chip *this, struct nand_bbt_descr *bd) > vfree(buf); instead of here would have fixed the leak without the need for an extra err label. > return 0; > > -err: > +err_free_buf: > + vfree(buf); > +err_free_bbt: > kfree(this->bbt); > this->bbt = NULL; > return res; ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/