[PATCH v2] clocksource: timer-integrator-ap: Fix resource leaks in error paths.

Path	csiph.com!weretis.net!feeder6.news.weretis.net!feeder5.news.weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Arvind Yadav <arvind.yadav.cs@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH v2] clocksource: timer-integrator-ap: Fix resource leaks in error paths.
Date	Wed, 28 Jun 2017 12:50:02 +0200
Message-ID	<tXiHM-5FO-5@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=jud+2YxBbHGU7Od/pJOt2W39Odp9IGRDQCIb8NVRboE=; b=i2kDcJJtwaKkb5PX89WJ5qJIF0cXpU8v5lOXFiMTpYbJkOQE+2dlCRYO+vqSeQ9u99 llvjiPOik3ak6KtsoNLpn50kT0ckx54zTrniDzMRe1gJuGzpMJxDPe7XUQqjLltCixgB xfpi+rWmFrKaKCHPEKf3HcYSFA+ASVS2pCWgdn54S8F0rVL3I/ubMIgky3H0OMotE5AD ruf3D18ALGj0s9TqXtu6p4O/SuAPuaMdZP7qi+aITs30CuqRmXZe6SnqUUOMdK9St3fC eLFIWnrs1AXuuXaQAgTsBp3Ao+E9xNd643CJLnzKVhWnII3/tBo4DSC2MBQOLocNxZ94 +Hpw==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jud+2YxBbHGU7Od/pJOt2W39Odp9IGRDQCIb8NVRboE=; b=gF58P18IXXlxlJaJH93LKycrLYZ5kBsiuhVz7TITv7GoJPqlZbzIuyGvZe+qwJSahM rkJKJZmMt8JzYX3fl9bYoOubkyewg7hJHb9KztnJNsMd1V3iuqM9RaD6T2MbJ/pXmGhk ygZsQUbxcWffUSbb3klytEPZMnJu7YWwmjxvPolQFNIsVbyDMojDw7VT7RnJjcIIcUGM Ew/U2GP4nNa1952TlCxfwJg6P+PlSeF4CsmlolXxrZ/aOJY4q+wPbAbErgh0DXT7Kpf+ I70bSQ1uKhWWYBHhFY+IUgs8xseSu2rS8FAw+U47BV1leQp+BCcW4GncfvWrob9oKR1W 5uJg==
X-Gm-Message-State	AKS2vOyNkC0hR42SJvIED55TZn5SO33cs1U2BLppT9vn7P9opSJjFyl/ PReGfAt2WUIYCbc3dRs=
X-Received	by 10.98.75.156 with SMTP id d28mr9933059pfj.135.1498646604257; Wed, 28 Jun 2017 03:43:24 -0700 (PDT)
X-Mailer	git-send-email 1.9.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	76
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org
X-Original-Date	Wed, 28 Jun 2017 16:12:33 +0530
X-Original-Message-ID	<2867db738b2b9eea3d1f5ce76a50d5fd06ed3666.1498646428.git.arvind.yadav.cs@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1676546

Show key headers only | View raw

Handle return value of clk_prepare_enable. In case of error at init time,
rollback iomapping and unprepare clk.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
Changes in v1:
              Subject was not correct.

 drivers/clocksource/timer-integrator-ap.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
index 04ad306..27de3f5 100644
--- a/drivers/clocksource/timer-integrator-ap.c
+++ b/drivers/clocksource/timer-integrator-ap.c
@@ -183,6 +183,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
 	unsigned long rate;
 	struct device_node *pri_node;
 	struct device_node *sec_node;
+	struct resource res;
 
 	base = of_io_request_and_map(node, 0, "integrator-timer");
 	if (IS_ERR(base))
@@ -191,9 +192,13 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
 	clk = of_clk_get(node, 0);
 	if (IS_ERR(clk)) {
 		pr_err("No clock for %s\n", node->name);
-		return PTR_ERR(clk);
+		err = PTR_ERR(clk);
+		goto err_mem;
 	}
-	clk_prepare_enable(clk);
+	err = clk_prepare_enable(clk);
+	if (err)
+		goto err_clk_put;
+
 	rate = clk_get_rate(clk);
 	writel(0, base + TIMER_CTRL);
 
@@ -201,7 +206,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
 				"arm,timer-primary", &path);
 	if (err) {
 		pr_warn("Failed to read property\n");
-		return err;
+		goto err_clk_disable;
 	}
 
 	pri_node = of_find_node_by_path(path);
@@ -210,7 +215,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
 				"arm,timer-secondary", &path);
 	if (err) {
 		pr_warn("Failed to read property\n");
-		return err;
+		goto err_clk_disable;
 	}
 
 
@@ -230,6 +235,16 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
 	clk_disable_unprepare(clk);
 
 	return 0;
+
+err_clk_disable:
+	clk_disable_unprepare(clk);
+err_clk_put:
+	clk_put(clk);
+err_mem:
+	iounmap(base);
+	of_address_to_resource(node, 0, &res);
+	release_mem_region(res.start, resource_size(&res));
+	return err;
 }
 
 CLOCKSOURCE_OF_DECLARE(integrator_ap_timer, "arm,integrator-timer",
-- 
1.9.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2] clocksource: timer-integrator-ap:  Fix resource leaks in error paths. Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-06-28 12:50 +0200

csiph-web