linux-kernel - [tip:timers/urgent] clocksource/drivers/timer-of: Handle of_irq_get

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>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 17 Jul 2017 13:45:40 -0700
From:   tip-bot for Sergei Shtylyov <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     daniel.lezcano@...aro.org, tglx@...utronix.de, hpa@...or.com,
        linux-kernel@...r.kernel.org, mingo@...nel.org,
        sergei.shtylyov@...entembedded.com
Subject: [tip:timers/urgent] clocksource/drivers/timer-of: Handle
 of_irq_get_byname() result correctly

Commit-ID:  32f2fea6e77e64cd4045ec2d5deb879aada3b476
Gitweb:     http://git.kernel.org/tip/32f2fea6e77e64cd4045ec2d5deb879aada3b476
Author:     Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
AuthorDate: Mon, 17 Jul 2017 21:00:44 +0300
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Mon, 17 Jul 2017 22:43:00 +0200

clocksource/drivers/timer-of: Handle of_irq_get_byname() result correctly

of_irq_get_byname() may return a negative error number as well as 0 on
failure, while timer_irq_init() only checks for 0, blithely continuing with
the call to request_[percpu_]irq() -- those functions expect *unsigned int*,
so would probably fail anyway when a large IRQ number resulting from a
conversion of a negative error number is passed to them... This, however,
is incorrect behavior -- error number is not IRQ number.

Filter out the negative error numbers, complain, and return them to the
timer_irq_init()'s callers...

Fixes: dc11bae78529 ("clocksource/drivers: Add timer-of common init routine")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Link: http://lkml.kernel.org/r/20170717180114.678825147@cogentembedded.com
---
 drivers/clocksource/timer-of.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index f6e7491..d509b50 100644
--- a/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@ -41,8 +41,16 @@ static __init int timer_irq_init(struct device_node *np,
 	struct timer_of *to = container_of(of_irq, struct timer_of, of_irq);
 	struct clock_event_device *clkevt = &to->clkevt;
 
-	of_irq->irq = of_irq->name ? of_irq_get_byname(np, of_irq->name):
-		irq_of_parse_and_map(np, of_irq->index);
+	if (of_irq->name) {
+		of_irq->irq = ret = of_irq_get_byname(np, of_irq->name);
+		if (ret < 0) {
+			pr_err("Failed to get interrupt %s for %s\n",
+			       of_irq->name, np->full_name);
+			return ret;
+		}
+	} else	{
+		of_irq->irq = irq_of_parse_and_map(np, of_irq->index);
+	}
 	if (!of_irq->irq) {
 		pr_err("Failed to map interrupt for %s\n", np->full_name);
 		return -EINVAL;