Commit 914d65f3 authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck

watchdog: Fix kref imbalance seen if handle_boot_enabled=0

If handle_boot_enabled is set to 0, the watchdog driver module use
counter will not be increased and kref_get() will not be called when
registering the watchdog. Subsequently, on open, this does not happen
either because the code believes that it was already done because the
hardware watchdog is marked as running.

We could introduce a state variable to indicate this state, but let's
just increase the module use counter and call kref_get() unconditionally
if the hardware watchdog is running when a driver is registering itself
to keep the code simple.

Fixes: 2501b015 ("watchdog: core: add option to avoid early ...")
Cc: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 4bcd615f
...@@ -967,15 +967,14 @@ static int watchdog_cdev_register(struct watchdog_device *wdd, dev_t devno) ...@@ -967,15 +967,14 @@ static int watchdog_cdev_register(struct watchdog_device *wdd, dev_t devno)
* and schedule an immediate ping. * and schedule an immediate ping.
*/ */
if (watchdog_hw_running(wdd)) { if (watchdog_hw_running(wdd)) {
if (handle_boot_enabled) {
__module_get(wdd->ops->owner); __module_get(wdd->ops->owner);
kref_get(&wd_data->kref); kref_get(&wd_data->kref);
if (handle_boot_enabled)
queue_delayed_work(watchdog_wq, &wd_data->work, 0); queue_delayed_work(watchdog_wq, &wd_data->work, 0);
} else { else
pr_info("watchdog%d running and kernel based pre-userspace handler disabled\n", pr_info("watchdog%d running and kernel based pre-userspace handler disabled\n",
wdd->id); wdd->id);
} }
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment