linux-kernel - [PATCH] watchdog: starfive: Check pm_runtime_enabled() before decrementing usage counter

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

Message-ID: <20240119082722.1133024-1-jisheng.teoh@starfivetech.com>
Date: Fri, 19 Jan 2024 16:27:21 +0800
From: Ji Sheng Teoh <jisheng.teoh@...rfivetech.com>
To: Xingyu Wu <xingyu.wu@...rfivetech.com>,
	Samin Guo <samin.guo@...rfivetech.com>,
	Wim Van Sebroeck <wim@...ux-watchdog.org>,
	Guenter Roeck <linux@...ck-us.net>,
	Emil Renner Berthing <emil.renner.berthing@...onical.com>
Cc: Ley Foon Tan <leyfoon.tan@...rfivetech.com>,
	linux-watchdog@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH] watchdog: starfive: Check pm_runtime_enabled() before decrementing usage counter

In the probe function, pm_runtime_put_sync() will fail on platform with
runtime PM disabled.
Check if runtime PM is enabled before calling pm_runtime_put_sync() to
fix it.

Fixes: db728ea9c7be ("drivers: watchdog: Add StarFive Watchdog driver")
Signed-off-by: Xingyu Wu <xingyu.wu@...rfivetech.com>
Signed-off-by: Ley Foon Tan <leyfoon.tan@...rfivetech.com>
Signed-off-by: Ji Sheng Teoh <jisheng.teoh@...rfivetech.com>
---
 drivers/watchdog/starfive-wdt.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
index e28ead24c520..df68ae4acbd7 100644
--- a/drivers/watchdog/starfive-wdt.c
+++ b/drivers/watchdog/starfive-wdt.c
@@ -494,8 +494,13 @@ static int starfive_wdt_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_exit;
 
-	if (!early_enable)
-		pm_runtime_put_sync(&pdev->dev);
+	if (!early_enable) {
+		if (pm_runtime_enabled(&pdev->dev)) {
+			ret = pm_runtime_put_sync(&pdev->dev);
+			if (ret)
+				goto err_exit;
+		}
+	}
 
 	return 0;
 
-- 
2.43.0