From 35560c7288919006a3daf57fe4dbfca82be4462f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 11 Jul 2013 21:47:25 +0200 Subject: fix wdt cloexec bug Signed-off-by: John Crispin --- watchdog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3