From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 23 Mar 2011 00:45:21 +0000 (+0100)
Subject: udevd: initialize fds, for proper close() on exit
X-Git-Tag: 174~221
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c6ee190277f9d4bf39269fdb167f9c430633c9b;p=systemd

udevd: initialize fds, for proper close() on exit
---

diff --git a/udev/udevd.c b/udev/udevd.c
index 2a42dfa7..03cd2cbc 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -75,7 +75,7 @@ static struct udev_rules *rules;
 static struct udev_queue_export *udev_queue_export;
 static struct udev_ctrl *udev_ctrl;
 static struct udev_monitor *monitor;
-static int worker_watch[2];
+static int worker_watch[2] = { -1, -1 };
 static pid_t settle_pid;
 static bool stop_exec_queue;
 static bool reload_config;
@@ -97,11 +97,11 @@ enum poll_fd {
 };
 
 static struct pollfd pfd[] = {
-	[FD_NETLINK] = { .events = POLLIN },
-	[FD_WORKER] =  { .events = POLLIN },
-	[FD_SIGNAL] =  { .events = POLLIN },
-	[FD_INOTIFY] = { .events = POLLIN },
-	[FD_CONTROL] = { .events = POLLIN },
+	[FD_NETLINK] = { .events = POLLIN, .fd = -1 },
+	[FD_WORKER] =  { .events = POLLIN, .fd = -1 },
+	[FD_SIGNAL] =  { .events = POLLIN, .fd = -1 },
+	[FD_INOTIFY] = { .events = POLLIN, .fd = -1 },
+	[FD_CONTROL] = { .events = POLLIN, .fd = -1 },
 };
 
 enum event_state {