From: John Crispin <blogic@openwrt.org>
Date: Thu, 11 Jul 2013 19:47:25 +0000 (+0200)
Subject: fix wdt cloexec bug
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35560c7288919006a3daf57fe4dbfca82be4462f;p=oweals%2Fprocd.git

fix wdt cloexec bug

Signed-off-by: John Crispin <blogic@openwrt.org>
---

diff --git a/watchdog.c b/watchdog.c
index e4b82f5..dc54308 100644
--- a/watchdog.c
+++ b/watchdog.c
@@ -101,12 +101,14 @@ void watchdog_init(void)
 		DEBUG(1, "Watchdog handover: fd=%s\n", env);
 		wdt_fd = atoi(env);
 		unsetenv("WDTFD");
+		fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
 	} else {
 		wdt_fd = open("/dev/watchdog", O_WRONLY);
+		if ((getpid() != 1) && (wdt_fd >= 0))
+			fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
 	}
 	if (wdt_fd < 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);