[PATCH 01/34] watchdog: s3c2410: Don't skip cleanup in remove's error path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Returning early in a platform driver's remove callback is wrong. In this
case the watchdog device is never removed although it's parent is gone
which likely can trigger a use-after-free in sysfs. Also the two used
clocks will never be disabled.

Instead only warn if s3c2410wdt_enable() fails and cleanup. Note that
returning 0 is the right thing to do then to suppress another warning
message by the driver core.

Fixes: 4f1f653a68d6 ("watchdog: s3c2410_wdt: use syscon regmap interface to configure pmu register")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
---
 drivers/watchdog/s3c2410_wdt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 200ba236a72e..cf104a844a43 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -782,7 +782,8 @@ static int s3c2410wdt_remove(struct platform_device *dev)
 
 	ret = s3c2410wdt_enable(wdt, false);
 	if (ret < 0)
-		return ret;
+		dev_warn(&dev->dev,
+			 "Failed to disable watchdog (%pe)\n", ERR_PTR(ret));
 
 	watchdog_unregister_device(&wdt->wdt_device);
 
-- 
2.39.1




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux