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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 C84EBC76188 for ; Fri, 19 Jul 2019 04:16:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93AAF2082F for ; Fri, 19 Jul 2019 04:16:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509801; bh=syZZBnjfBtK3ocT+pRFG7PdrCHkYbqDxpfD65lhU3zc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RD0gs+sKpU/rLrss+XoiCRP6mxLkKErrYh56kyCgnQi/kjzHd9GF6RQfvCr415Nvg whVQxcVlnbMC0tS4ljQWEogKcTSKTnEuEbnvhq50qh62sWqkgC+7Ys8+ozftRs98x1 OcE9npm9YXj5w3uwiCIPzGhTBG2QZnQljPPTdD3Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728202AbfGSEQk (ORCPT ); Fri, 19 Jul 2019 00:16:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:50960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389821AbfGSEOm (ORCPT ); Fri, 19 Jul 2019 00:14:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB7DC21851; Fri, 19 Jul 2019 04:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509681; bh=syZZBnjfBtK3ocT+pRFG7PdrCHkYbqDxpfD65lhU3zc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EwGXEEtteIwaRFaBqpmDozlzEHF7aTRQ9nTdqio14TmCI/faB/3FHOTpQKxMIv4zk GemrfPVICPazCIG68K+jYB/Pr5bjPzhVqERRJp8zvqqMuB5ubv8yhisqGS7FBl3We6 CqXblZCFRq2KbAe5/4opVtxgTblEZEU1jB/V9YmM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yoshihiro Shimoda , Julia Lawall , Geert Uytterhoeven , Kishon Vijay Abraham I , Sasha Levin Subject: [PATCH AUTOSEL 4.4 11/35] phy: renesas: rcar-gen2: Fix memory leak at error paths Date: Fri, 19 Jul 2019 00:13:59 -0400 Message-Id: <20190719041423.19322-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719041423.19322-1-sashal@kernel.org> References: <20190719041423.19322-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yoshihiro Shimoda [ Upstream commit d4a36e82924d3305a17ac987a510f3902df5a4b2 ] This patch fixes memory leak at error paths of the probe function. In for_each_child_of_node, if the loop returns, the driver should call of_put_node() before returns. Reported-by: Julia Lawall Fixes: 1233f59f745b237 ("phy: Renesas R-Car Gen2 PHY driver") Signed-off-by: Yoshihiro Shimoda Reviewed-by: Geert Uytterhoeven Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Sasha Levin --- drivers/phy/phy-rcar-gen2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c index c7a05996d5c1..99d2b73654f4 100644 --- a/drivers/phy/phy-rcar-gen2.c +++ b/drivers/phy/phy-rcar-gen2.c @@ -287,6 +287,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) error = of_property_read_u32(np, "reg", &channel_num); if (error || channel_num > 2) { dev_err(dev, "Invalid \"reg\" property\n"); + of_node_put(np); return error; } channel->select_mask = select_mask[channel_num]; @@ -302,6 +303,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) &rcar_gen2_phy_ops); if (IS_ERR(phy->phy)) { dev_err(dev, "Failed to create PHY\n"); + of_node_put(np); return PTR_ERR(phy->phy); } phy_set_drvdata(phy->phy, phy); -- 2.20.1