1
0
mirror of https://github.com/systemd/systemd.git synced 2025-01-07 21:18:41 +03:00

shutdown: explicitly close watchdog with disarm=false before we destroy watchdog resources

Otherwise we'll close the device disarming it as side-effect of
watchdog_free_device(), which is not intended. Hence, let's close the fd
first explicitly leaving it armed.

Fixes: #33075
This commit is contained in:
Lennart Poettering 2024-05-29 17:40:28 +02:00
parent bbd3832e6b
commit 79645d7376

View File

@ -561,7 +561,10 @@ int main(int argc, char *argv[]) {
}
/* We're done with the watchdog. Note that the watchdog is explicitly not stopped here. It remains
* active to guard against any issues during the rest of the shutdown sequence. */
* active to guard against any issues during the rest of the shutdown sequence. Note that we
* explicitly close the device with disarm=false here, before releasing the rest of the watchdog
* data. */
watchdog_close(/* disarm= */ false);
watchdog_free_device();
arguments[0] = NULL; /* Filled in by execute_directories(), when needed */