linux-kernel - [PATCH] clocksource: time-orion: Unmap region obtained by of

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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Wed, 21 Sep 2016 21:16:42 +0530
From:   Arvind Yadav <arvind.yadav.cs@...il.com>
To:     daniel.lezcano@...aro.org, tglx@...utronix.de
Cc:     viresh.kumar@...aro.org, jason@...edaemon.net,
        linux-kernel@...r.kernel.org
Subject: [PATCH] clocksource: time-orion: Unmap region obtained by of_iomap

Free memory mapping, if orion_timer_init is not successful.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@...il.com>
---
 drivers/clocksource/time-orion.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/clocksource/time-orion.c b/drivers/clocksource/time-orion.c
index a28f496..789070d 100644
--- a/drivers/clocksource/time-orion.c
+++ b/drivers/clocksource/time-orion.c
@@ -119,20 +119,22 @@ static int __init orion_timer_init(struct device_node *np)
 	clk = of_clk_get(np, 0);
 	if (IS_ERR(clk)) {
 		pr_err("%s: unable to get clk\n", np->name);
+		iounmap(timer_base);
 		return PTR_ERR(clk);
 	}
 
 	ret = clk_prepare_enable(clk);
 	if (ret) {
 		pr_err("Failed to prepare clock");
-		return ret;
+		goto err_iounmap;
 	}
 
 	/* we are only interested in timer1 irq */
 	irq = irq_of_parse_and_map(np, 1);
 	if (irq <= 0) {
 		pr_err("%s: unable to parse timer1 irq\n", np->name);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_iounmap;
 	}
 
 	/* setup timer0 as free-running clocksource */
@@ -147,7 +149,7 @@ static int __init orion_timer_init(struct device_node *np)
 				    clocksource_mmio_readl_down);
 	if (ret) {
 		pr_err("Failed to initialize mmio timer");
-		return ret;
+		goto err_iounmap;
 	}
 
 	sched_clock_register(orion_read_sched_clock, 32, clk_get_rate(clk));
@@ -156,7 +158,7 @@ static int __init orion_timer_init(struct device_node *np)
 	ret = setup_irq(irq, &orion_clkevt_irq);
 	if (ret) {
 		pr_err("%s: unable to setup irq\n", np->name);
-		return ret;
+		goto err_iounmap;
 	}
 
 	ticks_per_jiffy = (clk_get_rate(clk) + HZ/2) / HZ;
@@ -166,5 +168,10 @@ static int __init orion_timer_init(struct device_node *np)
 					ORION_ONESHOT_MIN, ORION_ONESHOT_MAX);
 
 	return 0;
+
+err_iounmap:
+	iounmap(timer_base);
+	return ret;
+
 }
 CLOCKSOURCE_OF_DECLARE(orion_timer, "marvell,orion-timer", orion_timer_init);
-- 
2.7.4