public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed
From: Kang Chen <void0red@hust.edu.cn>
To: dzm91@hust.edu.cn
Cc: rafael@kernel.org, daniel.lezcano@linaro.org, amitk@kernel.org,
	rui.zhang@intel.com, matthias.bgg@gmail.com,
	angelogioacchino.delregno@collabora.com, daniel@makrotopia.org,
	rdunlap@infradead.org, bchihi@baylibre.com,
	henry.yen@mediatek.com, linux-pm@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-mediatek@lists.infradead.org,
	hust-os-kernel-patches@googlegroups.com, void0red@gmail.com,
	error27@gmail.com, Kang Chen <void0red@hust.edu.cn>
Subject: [PATCH] drivers: thermal: mediatek: fix of_iomap leak in mtk_thermal_probe
Date: Mon,  3 Apr 2023 18:38:55 +0800	[thread overview]
Message-ID: <20230403103855.3601901-1-void0red@hust.edu.cn> (raw)

Smatch reports:
1. mtk_thermal_probe() warn: 'apmixed_base' from of_iomap() not released.
2. mtk_thermal_probe() warn: 'auxadc_base' from of_iomap() not released.

The original code forgets to release iomap resource when handling errors,
fix it through unified error handling code at the end of mtk_thermal_probe.

Fixes: 89945047b166 ("thermal: mediatek: Add tsensor support for V2 thermal system")
Signed-off-by: Kang Chen <void0red@hust.edu.cn>
---
I think the this should be released on the success path but I was too
scared of breaking things. Let me know and I will resend if people want
me to do that.

 drivers/thermal/mediatek/auxadc_thermal.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/thermal/mediatek/auxadc_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c
index ab730f9552d0..741c7d8151bd 100644
--- a/drivers/thermal/mediatek/auxadc_thermal.c
+++ b/drivers/thermal/mediatek/auxadc_thermal.c
@@ -1149,13 +1149,15 @@ static int mtk_thermal_probe(struct platform_device *pdev)
 
 	if (auxadc_phys_base == OF_BAD_ADDR) {
 		dev_err(&pdev->dev, "Can't get auxadc phys address\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_iounmap_auxadc;
 	}
 
 	apmixedsys = of_parse_phandle(np, "mediatek,apmixedsys", 0);
 	if (!apmixedsys) {
 		dev_err(&pdev->dev, "missing apmixedsys node\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto err_iounmap_auxadc;
 	}
 
 	apmixed_base = of_iomap(apmixedsys, 0);
@@ -1165,17 +1167,18 @@ static int mtk_thermal_probe(struct platform_device *pdev)
 
 	if (apmixed_phys_base == OF_BAD_ADDR) {
 		dev_err(&pdev->dev, "Can't get auxadc phys address\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_iounmap_apmixed;
 	}
 
 	ret = device_reset_optional(&pdev->dev);
 	if (ret)
-		return ret;
+		goto err_iounmap_apmixed;
 
 	ret = clk_prepare_enable(mt->clk_auxadc);
 	if (ret) {
 		dev_err(&pdev->dev, "Can't enable auxadc clk: %d\n", ret);
-		return ret;
+		goto err_iounmap_apmixed;
 	}
 
 	ret = clk_prepare_enable(mt->clk_peri_therm);
@@ -1220,7 +1223,10 @@ static int mtk_thermal_probe(struct platform_device *pdev)
 	clk_disable_unprepare(mt->clk_peri_therm);
 err_disable_clk_auxadc:
 	clk_disable_unprepare(mt->clk_auxadc);
-
+err_iounmap_apmixed:
+	iounmap(apmixed_base);
+err_iounmap_auxadc:
+	iounmap(auxadc_base);
 	return ret;
 }
 
-- 
2.34.1


             reply	other threads:[~2023-04-03 10:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-03 10:38 Kang Chen [this message]
2023-04-03 11:32 ` [PATCH] drivers: thermal: mediatek: fix of_iomap leak in mtk_thermal_probe Daniel Lezcano
2023-04-03 16:46   ` [PATCH v2 1/2] thermal: mediatek: use devm_of_iomap to avoid resource " Kang Chen
2023-04-03 16:46     ` [PATCH v2 2/2] thermal: mediatek: change clk_prepare_enable to devm_clk_get_enabled " Kang Chen
2023-04-10  3:46       ` 陈康
2023-04-10 19:42         ` Daniel Lezcano
2023-04-11  6:35           ` [PATCH v3 1/2] thermal: mediatek: use devm_of_iomap to avoid resource leak " Kang Chen
2023-04-11  6:35             ` [PATCH v3 2/2] thermal: mediatek: change clk_prepare_enable to devm_clk_get_enabled " Kang Chen
2023-04-15  7:14               ` void0red
2023-04-17  9:52                 ` Daniel Lezcano
     [not found]                   ` <6108982E-A3DC-4B7E-829E-20BBAC9C503F@hust.edu.cn>
2023-04-17 10:43                     ` Dan Carpenter
2023-04-17 12:55                       ` [PATCH v4 1/2] thermal: mediatek: use devm_of_iomap to avoid resource leak " Kang Chen
2023-04-17 12:55                         ` [PATCH v4 2/2] thermal: mediatek: change clk_prepare_enable to devm_clk_get_enabled " Kang Chen
2023-04-18  9:25                         ` [PATCH v4 1/2] thermal: mediatek: use devm_of_iomap to avoid resource leak " AngeloGioacchino Del Regno

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230403103855.3601901-1-void0red@hust.edu.cn \
    --to=void0red@hust.edu.cn \
    --cc=amitk@kernel.org \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=bchihi@baylibre.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=daniel@makrotopia.org \
    --cc=dzm91@hust.edu.cn \
    --cc=error27@gmail.com \
    --cc=henry.yen@mediatek.com \
    --cc=hust-os-kernel-patches@googlegroups.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=matthias.bgg@gmail.com \
    --cc=rafael@kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=rui.zhang@intel.com \
    --cc=void0red@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox