From patchwork Thu Jun 2 13:23:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12867846 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3204AC433EF for ; Thu, 2 Jun 2022 13:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Kjxwbk0QQWURowfMMb4kaWxVQWOecR6MMjDONlpEfpw=; b=HIXgiDkoEPluC8 BDgec73I7f4hpkd+a8SWHgGI4IE8UKvEQJyTKLdvVRS0uEE4SPAMc2VIwyIaMxu6tGgE6VlCLcWCW rFQSTy0mKKtHKI++0nE1AUWZYLaSqoRwN9qkggGwqYj9B7WyvO3OElRrPT+RwOBSjjfAqojnnC4ye f6PIodpdQA/ebBPH5Oy7xWpiEXk/bn7YY+rR/yNXpIZzUjjigdU+QKEOZJsmL0KzCDoYDqCqF328f Ww+FTrN5N24+3KnE5ORpgAWKSsiP7mZp6aqQl1ADVnac4wQdiL/X+afIRJwJuNE3lZOamNCYMZgpV ORlSTmrUTyc3z9HKm+Qg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwko5-003Nwy-U8; Thu, 02 Jun 2022 13:24:10 +0000 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwko2-003Nvz-CB for linux-arm-kernel@lists.infradead.org; Thu, 02 Jun 2022 13:24:07 +0000 Received: by mail-pf1-x42c.google.com with SMTP id y196so4756377pfb.6 for ; Thu, 02 Jun 2022 06:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+og5Yeb4185sTD8OGrlB2+zCZSKPKau88+Z65n/Fsdc=; b=e4x5bmlIS6xIJZaJiI4f+pU6+zuWb0iGbgdfo7XYrp3uw0o+Dx4q2TPn2vP4rUoF/c Io67w3LNXkbEyIhrKe5rCn+6hgj3gXNR+cU2SkFMPHgAXV5ldyTsFgkxhP0fQmfwmUwA Sisy5tF02DsmOlDCRoouhRUHdEvj1f+D5/qAxP0i0U3zA0jZ9Vhw5wQaOOJQKSbE6DNw 44zNTuevuyhn1gxNpcmmnRYYjG88624/UW5KT95gcXQbCa9IwUwvkCB2ztobUaP5w2hk EBFXnITA5GZh9C0ZtxpdS0znCEVd6T8MlNbSJgeur4jfpsddgZ7e+XGtp/8PT1WlqKHv AHjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+og5Yeb4185sTD8OGrlB2+zCZSKPKau88+Z65n/Fsdc=; b=NCeu1LCZ2AvuPi0xqI+0C7sZh/RdhevGfNVkmTOcz+HvkJGN9e92noMQnNds/PACzW /ywLK0+qdLQAIfuIdIobl3HAN5kZpDJEFPyF6DaKg4eti/EibHq7L1oiwRN5p5jIJb65 M3hhR+z6RVYH0m9aaUF1JATMrwC+KQp9JSJEO+rp3yoV+VC4uK4T4ztju7rG6qMu8b5v hltT8tG/g86kfQxTC+O1gMWfEgobogqfRl2c7lbqUaj/Rj/vufWNihZn7jLeEo/gqsYT g5eMg3fN5k7IMxxFFOMZLT/R22k8a6MdR5IgPjfg6ZVNDeEo7JsWixwPdw1/2bHCXGYb 2Ttg== X-Gm-Message-State: AOAM533d5D3lwUXNStkB/sHSsFuT/WrdeINBYR/WDoRMZE+8wAY9yjuo Q4vCb57pWyzkmZlqkr5L0c4= X-Google-Smtp-Source: ABdhPJwm8YwOa1l2YYBjILf/L7Lk/9JJ3VQncruyKOiVbFuJHVipVaKide0lxzv0+3W5I9myJnPcyw== X-Received: by 2002:a62:820a:0:b0:51b:d1f9:b45f with SMTP id w10-20020a62820a000000b0051bd1f9b45fmr1584026pfd.63.1654176244939; Thu, 02 Jun 2022 06:24:04 -0700 (PDT) Received: from localhost.localdomain ([202.120.234.246]) by smtp.googlemail.com with ESMTPSA id b10-20020a17090a5a0a00b001cd4989febcsm5910774pjd.8.2022.06.02.06.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 06:24:04 -0700 (PDT) From: Miaoqian Lin To: Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Miaoqian Lin , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] soc: imx: gpc: Fix refcount leak in imx_gpc_probe Date: Thu, 2 Jun 2022 17:23:52 +0400 Message-Id: <20220602132355.29847-1-linmq006@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220602_062406_455919_5AD636C7 X-CRM114-Status: GOOD ( 14.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak. Fixes: format:721cabf6c660 ("soc: imx: move PGC handling to a new GPC driver") Signed-off-by: Miaoqian Lin --- drivers/soc/imx/gpc.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index 90a8b2c0676f..5df47e6d7585 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -419,8 +419,10 @@ static int imx_gpc_probe(struct platform_device *pdev) return 0; base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(base)) - return PTR_ERR(base); + if (IS_ERR(base)) { + ret = PTR_ERR(base); + goto put_pgc_node; + } regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL, base, &imx_gpc_regmap_config); @@ -428,7 +430,7 @@ static int imx_gpc_probe(struct platform_device *pdev) ret = PTR_ERR(regmap); dev_err(&pdev->dev, "failed to init regmap: %d\n", ret); - return ret; + goto put_pgc_node; } /* @@ -464,15 +466,18 @@ static int imx_gpc_probe(struct platform_device *pdev) int domain_index; ipg_clk = devm_clk_get(&pdev->dev, "ipg"); - if (IS_ERR(ipg_clk)) - return PTR_ERR(ipg_clk); + if (IS_ERR(ipg_clk)) { + ret = PTR_ERR(ipg_clk); + goto put_pgc_node; + } + ipg_rate_mhz = clk_get_rate(ipg_clk) / 1000000; for_each_child_of_node(pgc_node, np) { ret = of_property_read_u32(np, "reg", &domain_index); if (ret) { of_node_put(np); - return ret; + goto put_pgc_node; } if (domain_index >= of_id_data->num_domains) continue; @@ -481,7 +486,8 @@ static int imx_gpc_probe(struct platform_device *pdev) domain_index); if (!pd_pdev) { of_node_put(np); - return -ENOMEM; + ret = -ENOMEM; + goto put_pgc_node; } ret = platform_device_add_data(pd_pdev, @@ -490,7 +496,7 @@ static int imx_gpc_probe(struct platform_device *pdev) if (ret) { platform_device_put(pd_pdev); of_node_put(np); - return ret; + goto put_pgc_node; } domain = pd_pdev->dev.platform_data; domain->regmap = regmap; @@ -503,12 +509,17 @@ static int imx_gpc_probe(struct platform_device *pdev) if (ret) { platform_device_put(pd_pdev); of_node_put(np); - return ret; + goto put_pgc_node; } } } + of_node_put(pgc_node); return 0; + +put_pgc_node: + of_node_put(pgc_node); + return ret; } static int imx_gpc_remove(struct platform_device *pdev)