SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog: always disarm watchdog properly before closing it

Browse Source 
If we change the watchdog device we should disarm the old one first.

Similar, if we open the watchdog, but then fail setting it up, disarm it
before closing it again.
This commit is contained in:
Lennart Poettering
2023-05-15 21:55:19 +08:00
committed by Mike Yuan
parent 4340e5b6df
commit f81048f8f5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/watchdog.c
+10 -5
View File
@@ -318,9 +318,10 @@ static int open_watchdog(void) {
STRV_FOREACH(wd, try_order) {
watchdog_fd = open(*wd, O_WRONLY|O_CLOEXEC);
if (watchdog_fd >= 0) {
r = free_and_strdup(&watchdog_device, *wd);
if (r < 0)
return log_oom_debug();
if (free_and_strdup(&watchdog_device, *wd) < 0) {
r = log_oom_debug();
goto close_and_fail;
}
break;
}
@@ -342,8 +343,12 @@ static int open_watchdog(void) {
r = update_timeout();
if (r < 0)
watchdog_close(true);
goto close_and_fail;
return 0;
close_and_fail:
watchdog_close(/* disarm= */ true);
return r;
}
@@ -356,7 +361,7 @@ int watchdog_set_device(const char *path) {
r = free_and_strdup(&watchdog_device, path);
if (r > 0) /* watchdog_device changed */
watchdog_fd = safe_close(watchdog_fd);
watchdog_close(/* disarm= */ true);
return r;
}