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=-10.0 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,URIBL_BLOCKED,USER_AGENT_GIT 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 ABF62C433E0 for ; Tue, 23 Jun 2020 20:50:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E0D920702 for ; Tue, 23 Jun 2020 20:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945451; bh=3PAE0rb8umTgiVnbizPCTpcvNcF8NBTtTzgHjp8hxiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gkw4JH65sdT74oc2GvSQYpTaz+dhEX7lg0BbzbdvMpNBNoGHRbU0yXev6YZxeMrsJ WZ+9ruLCpwqQCJKe7CL96gYBzK9VRKGCLcmTdUKYyDOb9R5+XZN9pu+oQAzkPuf9xl 3NYa/tm3+GYSH3RPgDX7qQlri353EATtlZhHBako= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392996AbgFWUut (ORCPT ); Tue, 23 Jun 2020 16:50:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:47768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392640AbgFWUsi (ORCPT ); Tue, 23 Jun 2020 16:48:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 558902098B; Tue, 23 Jun 2020 20:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945318; bh=3PAE0rb8umTgiVnbizPCTpcvNcF8NBTtTzgHjp8hxiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C8UJrRoTw/PCFF205zc76Sd8njwp+rDBAB7U3XoWMFAqfLT7uUNfagt9/bqNrB8U2 2nZhvbWN8wCcGzzyHoGJxmUfi8nXPEmQVCVhCpkRLyZoyJg16Fvyq4GKT6+Ks0wZyM dfx0B8jjUYBfdvwGD+Q5E9FnGSegCE1BHXmX+W/Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nishka Dasgupta , Miquel Raynal , Sasha Levin Subject: [PATCH 4.14 124/136] mtd: rawnand: oxnas: Add of_node_put() Date: Tue, 23 Jun 2020 21:59:40 +0200 Message-Id: <20200623195310.017515738@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nishka Dasgupta [ Upstream commit c436f68beeb20f2f92937677db1d9069b0dd2a3d ] Each iteration of for_each_child_of_node puts the previous node, but in the case of a goto from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put under a new goto to put the node at a loop exit. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta Signed-off-by: Miquel Raynal Signed-off-by: Sasha Levin --- drivers/mtd/nand/oxnas_nand.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c index ff58999887388..7f0ba28f8a007 100644 --- a/drivers/mtd/nand/oxnas_nand.c +++ b/drivers/mtd/nand/oxnas_nand.c @@ -123,7 +123,7 @@ static int oxnas_nand_probe(struct platform_device *pdev) GFP_KERNEL); if (!chip) { err = -ENOMEM; - goto err_clk_unprepare; + goto err_release_child; } chip->controller = &oxnas->base; @@ -144,12 +144,12 @@ static int oxnas_nand_probe(struct platform_device *pdev) /* Scan to find existence of the device */ err = nand_scan(mtd, 1); if (err) - goto err_clk_unprepare; + goto err_release_child; err = mtd_device_register(mtd, NULL, 0); if (err) { nand_release(chip); - goto err_clk_unprepare; + goto err_release_child; } oxnas->chips[nchips] = chip; @@ -166,6 +166,8 @@ static int oxnas_nand_probe(struct platform_device *pdev) return 0; +err_release_child: + of_node_put(nand_np); err_clk_unprepare: clk_disable_unprepare(oxnas->clk); return err; -- 2.25.1