linux-kernel - [tip: timers/urgent] clocksource/drivers/dw_apb_timer

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:   Sat, 11 Dec 2021 13:05:09 -0000
From:   "tip-bot2 for Alexey Sheplyakov" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     "Vadim V. Vlasov" <vadim.vlasov@...itech.ru>,
        Alexey Sheplyakov <asheplyakov@...ealt.ru>,
        Daniel Lezcano <daniel.lezcano@...aro.org>,
        Dinh Nguyen <dinguyen@...nel.org>,
        Thomas Gleixner <tglx@...utronix.de>, x86@...nel.org,
        linux-kernel@...r.kernel.org
Subject: [tip: timers/urgent] clocksource/drivers/dw_apb_timer_of: Fix probe failure

The following commit has been merged into the timers/urgent branch of tip:

Commit-ID:     a663bd19114d79f0902e2490fc484e5a7419cdc2
Gitweb:        https://git.kernel.org/tip/a663bd19114d79f0902e2490fc484e5a7419cdc2
Author:        Alexey Sheplyakov <asheplyakov@...ealt.ru>
AuthorDate:    Tue, 09 Nov 2021 19:34:02 +04:00
Committer:     Daniel Lezcano <daniel.lezcano@...aro.org>
CommitterDate: Fri, 10 Dec 2021 17:46:54 +01:00

clocksource/drivers/dw_apb_timer_of: Fix probe failure

The driver refuses to probe with -EINVAL since the commit 5d9814df0aec
("clocksource/drivers/dw_apb_timer_of: Add error handling if no clock
available").

Before the driver used to probe successfully if either "clock-freq" or
"clock-frequency" properties has been specified in the device tree.

That commit changed

if (A && B)
	panic("No clock nor clock-frequency property");

into

if (!A && !B)
	return 0;

That's a bug: the reverse of `A && B` is '!A || !B', not '!A && !B'

Signed-off-by: Vadim V. Vlasov <vadim.vlasov@...itech.ru>
Signed-off-by: Alexey Sheplyakov <asheplyakov@...ealt.ru>
Fixes: 5d9814df0aec56a6 ("clocksource/drivers/dw_apb_timer_of: Add error handling if no clock available").
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: Dinh Nguyen <dinguyen@...nel.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vadim V. Vlasov <vadim.vlasov@...itech.ru>
Acked-by: Dinh Nguyen <dinguyen@...nel.org>
Link: https://lore.kernel.org/r/20211109153401.157491-1-asheplyakov@basealt.ru
Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
---
 drivers/clocksource/dw_apb_timer_of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
index 3819ef5..3245eb0 100644
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@ -47,7 +47,7 @@ static int __init timer_get_base_and_rate(struct device_node *np,
 			pr_warn("pclk for %pOFn is present, but could not be activated\n",
 				np);
 
-	if (!of_property_read_u32(np, "clock-freq", rate) &&
+	if (!of_property_read_u32(np, "clock-freq", rate) ||
 	    !of_property_read_u32(np, "clock-frequency", rate))
 		return 0;