linux-kernel - [PATCH] drivers: loongson: fix memory leak in loongson2_guts

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon,  6 Mar 2023 09:22:00 +0800
From:   Dongliang Mu <dzm91@...t.edu.cn>
To:     Yinbo Zhu <zhuyinbo@...ngson.cn>
Cc:     Dongliang Mu <dzm91@...t.edu.cn>, loongarch@...ts.linux.dev,
        linux-kernel@...r.kernel.org
Subject: [PATCH] drivers: loongson: fix memory leak in loongson2_guts_probe/remove

drivers/soc/loongson/loongson2_guts.c:150 loongson2_guts_probe()
warn: 'guts->regs' from ioremap() not released on lines: 131,135,139,143.

Fix this by invoking iounmap() in the error handling code and the remove
function.

Note that, this patch is not tested due to the loongson architecture.

Signed-off-by: Dongliang Mu <dzm91@...t.edu.cn>
---
 drivers/soc/loongson/loongson2_guts.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/soc/loongson/loongson2_guts.c b/drivers/soc/loongson/loongson2_guts.c
index bace4bc8e03b..ba330adb555c 100644
--- a/drivers/soc/loongson/loongson2_guts.c
+++ b/drivers/soc/loongson/loongson2_guts.c
@@ -98,6 +98,7 @@ static int loongson2_guts_probe(struct platform_device *pdev)
 	const struct loongson2_soc_die_attr *soc_die;
 	const char *machine;
 	u32 svr;
+	int rc = -ENOMEM;
 
 	/* Initialize guts */
 	guts = devm_kzalloc(dev, sizeof(*guts), GFP_KERNEL);
@@ -128,19 +129,21 @@ static int loongson2_guts_probe(struct platform_device *pdev)
 		soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "Loongson");
 	}
 	if (!soc_dev_attr.family)
-		return -ENOMEM;
+		goto iounmap;
 	soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL,
 					     "svr:0x%08x", svr);
 	if (!soc_dev_attr.soc_id)
-		return -ENOMEM;
+		goto iounmap;
 	soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
 					       (svr >>  4) & 0xf, svr & 0xf);
 	if (!soc_dev_attr.revision)
-		return -ENOMEM;
+		goto iounmap;
 
 	soc_dev = soc_device_register(&soc_dev_attr);
-	if (IS_ERR(soc_dev))
-		return PTR_ERR(soc_dev);
+	if (IS_ERR(soc_dev)) {
+		rc = PTR_ERR(soc_dev);
+		goto iounmap;
+	}
 
 	pr_info("Machine: %s\n", soc_dev_attr.machine);
 	pr_info("SoC family: %s\n", soc_dev_attr.family);
@@ -148,11 +151,16 @@ static int loongson2_guts_probe(struct platform_device *pdev)
 		soc_dev_attr.soc_id, soc_dev_attr.revision);
 
 	return 0;
+
+iounmap:
+	iounmap(guts->regs);
+	return rc;
 }
 
 static int loongson2_guts_remove(struct platform_device *dev)
 {
 	soc_device_unregister(soc_dev);
+	iounmap(guts->regs);
 
 	return 0;
 }
-- 
2.39.2