procd: Fix minor null pointer dereference.

[project/procd.git] / watchdog.c

diff --git a/watchdog.c b/watchdog.c
index e4b82f5..97c8337 100644 (file)
--- a/watchdog.c
+++ b/watchdog.c
@@ -31,21 +31,81 @@
 static struct uloop_timeout wdt_timeout;
 static int wdt_fd = -1;
 static int wdt_frequency = 5;
+static bool wdt_magicclose = false;
 
-static void watchdog_timeout_cb(struct uloop_timeout *t)
+void watchdog_ping(void)
 {
-       DEBUG(2, "Ping\n");
-       if (write(wdt_fd, "X", 1) < 0)
+       DEBUG(4, "Ping\n");
+       if (wdt_fd >= 0 && write(wdt_fd, "X", 1) < 0)
                ERROR("WDT failed to write: %s\n", strerror(errno));
+}
+
+static void watchdog_timeout_cb(struct uloop_timeout *t)
+{
+       watchdog_ping();
        uloop_timeout_set(t, wdt_frequency * 1000);
 }
 
+static int watchdog_open(bool cloexec)
+{
+       char *env = getenv("WDTFD");
+
+       if (wdt_fd >= 0)
+               return wdt_fd;
+
+       if (env) {
+               DEBUG(2, "Watchdog handover: fd=%s\n", env);
+               wdt_fd = atoi(env);
+               unsetenv("WDTFD");
+       } else {
+               wdt_fd = open(WDT_PATH, O_WRONLY);
+       }
+
+       if (wdt_fd < 0)
+               return wdt_fd;
+
+       if (cloexec)
+               fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
+
+       return wdt_fd;
+}
+
+static void watchdog_close(void)
+{
+       if (wdt_fd < 0)
+               return;
+
+       if (write(wdt_fd, "V", 1) < 0)
+               ERROR("WDT failed to write release: %s\n", strerror(errno));
+
+       if (close(wdt_fd) == -1)
+               ERROR("WDT failed to close watchdog: %s\n", strerror(errno));
+
+       wdt_fd = -1;
+}
+
+void watchdog_set_magicclose(bool val)
+{
+       wdt_magicclose = val;
+}
+
+bool watchdog_get_magicclose(void)
+{
+       return wdt_magicclose;
+}
+
 void watchdog_set_stopped(bool val)
 {
-       if (val)
+       if (val) {
                uloop_timeout_cancel(&wdt_timeout);
-       else
+
+               if (wdt_magicclose)
+                       watchdog_close();
+       }
+       else {
+               watchdog_open(true);
                watchdog_timeout_cb(&wdt_timeout);
+       }
 }
 
 bool watchdog_get_stopped(void)
@@ -59,7 +119,7 @@ int watchdog_timeout(int timeout)
                return 0;
 
        if (timeout) {
-               DEBUG(2, "Set watchdog timeout: %ds\n", timeout);
+               DEBUG(4, "Set watchdog timeout: %ds\n", timeout);
                ioctl(wdt_fd, WDIOC_SETTIMEOUT, &timeout);
        }
        ioctl(wdt_fd, WDIOC_GETTIMEOUT, &timeout);
@@ -73,7 +133,7 @@ int watchdog_frequency(int frequency)
                return 0;
 
        if (frequency) {
-               DEBUG(2, "Set watchdog frequency: %ds\n", frequency);
+               DEBUG(4, "Set watchdog frequency: %ds\n", frequency);
                wdt_frequency = frequency;
        }
 
@@ -91,25 +151,30 @@ char* watchdog_fd(void)
        return fd_buf;
 }
 
-void watchdog_init(void)
+void watchdog_init(int preinit)
 {
-       char *env = getenv("WDTFD");
-
-
        wdt_timeout.cb = watchdog_timeout_cb;
-       if (env) {
-               DEBUG(1, "Watchdog handover: fd=%s\n", env);
-               wdt_fd = atoi(env);
-               unsetenv("WDTFD");
-       } else {
-               wdt_fd = open("/dev/watchdog", O_WRONLY);
-       }
-       if (wdt_fd < 0)
+
+       if (watchdog_open(!preinit) < 0)
                return;
-       fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
+
        LOG("- watchdog -\n");
        watchdog_timeout(30);
        watchdog_timeout_cb(&wdt_timeout);
 
-       DEBUG(2, "Opened watchdog with timeout %ds\n", watchdog_timeout(0));
+       DEBUG(4, "Opened watchdog with timeout %ds\n", watchdog_timeout(0));
+}
+
+
+void watchdog_set_cloexec(bool val)
+{
+       if (wdt_fd < 0)
+               return;
+
+       int flags = fcntl(wdt_fd, F_GETFD);
+       if (val)
+               flags |= FD_CLOEXEC;
+       else
+               flags &= ~FD_CLOEXEC;
+       fcntl(wdt_fd, F_SETFD,  flags);
 }