linux-kernel - [tip: timers/clocksource] clocksource/drivers/stm: Fix double deregistration on probe failure

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]

Message-ID: <176416804447.498.12699066995574579652.tip-bot2@tip-bot2>
Date: Wed, 26 Nov 2025 14:40:44 -0000
From: "tip-bot2 for Johan Hovold" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Johan Hovold <johan@...nel.org>,
 Daniel Lezcano <daniel.lezcano@...aro.org>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: timers/clocksource] clocksource/drivers/stm: Fix double
 deregistration on probe failure

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

Commit-ID:     6b38a8b31e2c5c2c3fd5f9848850788c190f216d
Gitweb:        https://git.kernel.org/tip/6b38a8b31e2c5c2c3fd5f9848850788c190f216d
Author:        Johan Hovold <johan@...nel.org>
AuthorDate:    Fri, 17 Oct 2025 07:50:39 +02:00
Committer:     Daniel Lezcano <daniel.lezcano@...aro.org>
CommitterDate: Wed, 26 Nov 2025 11:24:37 +01:00

clocksource/drivers/stm: Fix double deregistration on probe failure

The purpose of the devm_add_action_or_reset() helper is to call the
action function in case adding an action ever fails so drop the clock
source deregistration from the error path to avoid deregistering twice.

Fixes: cec32ac75827 ("clocksource/drivers/nxp-timer: Add the System Timer Module for the s32gx platforms")
Signed-off-by: Johan Hovold <johan@...nel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Link: https://patch.msgid.link/20251017055039.7307-1-johan@kernel.org
---
 drivers/clocksource/timer-nxp-stm.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/clocksource/timer-nxp-stm.c b/drivers/clocksource/timer-nxp-stm.c
index bbc4062..16d5216 100644
--- a/drivers/clocksource/timer-nxp-stm.c
+++ b/drivers/clocksource/timer-nxp-stm.c
@@ -208,10 +208,8 @@ static int __init nxp_stm_clocksource_init(struct device *dev, struct stm_timer 
 		return ret;
 
 	ret = devm_add_action_or_reset(dev, devm_clocksource_unregister, stm_timer);
-	if (ret) {
-		clocksource_unregister(&stm_timer->cs);
+	if (ret)
 		return ret;
-	}
 
 	stm_sched_clock = stm_timer;