From 6b951c55b61c95ad485edd68762416b6c7d8178e Mon Sep 17 00:00:00 2001 From: Dainis Jonitis Date: Mon, 26 Nov 2018 14:45:53 +0200 Subject: [PATCH] treewide: give file descriptors safe initial value Since main problem of assuming that fd==0 is invalid value was fixed in upstream odhcpd by e7b1d4bf3a2297192638b9c84208b3dcb306ecd8 then what is left are minor problems of static initialization of some global fd variables. Signed-off-by: Dainis Jonitis --- src/config.c | 4 ++-- src/odhcpd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.c b/src/config.c index 47eb65f..399922b 100644 --- a/src/config.c +++ b/src/config.c @@ -20,7 +20,7 @@ #include "odhcpd.h" static struct blob_buf b; -static int reload_pipe[2]; +static int reload_pipe[2] = { -1, -1 }; static int lease_cmp(const void *k1, const void *k2, void *ptr); static void lease_update(struct vlist_tree *tree, struct vlist_node *node_new, @@ -1087,7 +1087,7 @@ static void reload_cb(struct uloop_fd *u, _unused unsigned int events) odhcpd_reload(); } -static struct uloop_fd reload_fd = { .cb = reload_cb }; +static struct uloop_fd reload_fd = { .fd = -1, .cb = reload_cb }; void odhcpd_run(void) { diff --git a/src/odhcpd.c b/src/odhcpd.c index 91b5db4..4b8e589 100644 --- a/src/odhcpd.c +++ b/src/odhcpd.c @@ -45,7 +45,7 @@ -static int ioctl_sock; +static int ioctl_sock = -1; static int urandom_fd = -1; static void sighandler(_unused int signal) -- 2.25.1