use CLOEXEC flags instead of fcntl()

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index 876d2ec1df0133f0f78c1cf847a2ceb9094ea673..88e117f50a1f46807688aeafebaaa4e7295510e9 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -24,12 +24,14 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <stdbool.h>

 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <time.h>
 #include <getopt.h>
 #include <dirent.h>
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <time.h>
 #include <getopt.h>
 #include <dirent.h>

+#include <sys/time.h>

 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/signalfd.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/signalfd.h>


@@ -45,34 +47,42 @@
 #define UDEVD_PRIORITY                 -4
 #define UDEV_PRIORITY                  -2
 
 #define UDEVD_PRIORITY                 -4
 #define UDEV_PRIORITY                  -2
 

-static int debug;
+static bool debug;

 
 static void log_fn(struct udev *udev, int priority,
                   const char *file, int line, const char *fn,
                   const char *format, va_list args)
 {
        if (debug) {
 
 static void log_fn(struct udev *udev, int priority,
                   const char *file, int line, const char *fn,
                   const char *format, va_list args)
 {
        if (debug) {

-               fprintf(stderr, "[%d] %s: ", (int) getpid(), fn);
-               vfprintf(stderr, format, args);
+               char buf[1024];
+               struct timeval tv;
+               struct timezone tz;
+
+               vsnprintf(buf, sizeof(buf), format, args);
+               gettimeofday(&tv, &tz);
+               fprintf(stderr, "%llu.%06u [%u] %s: %s",
+                       (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+                       (int) getpid(), fn, buf);

        } else {
                vsyslog(priority, format, args);
        }
 }
 
        } else {
                vsyslog(priority, format, args);
        }
 }
 

-static int debug_trace;
+static bool debug_trace;

 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 pid_t settle_pid;
 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 pid_t settle_pid;

-static int stop_exec_queue;
-static int reload_config;
+static bool stop_exec_queue;
+static bool reload_config;

 static int max_childs;
 static int childs;
 static int max_childs;
 static int childs;

+static sigset_t orig_sigmask;

 static struct udev_list_node event_list;
 static struct udev_list_node worker_list;
 static struct udev_list_node event_list;
 static struct udev_list_node worker_list;

-static int udev_exit;
+static bool udev_exit;

 static volatile sig_atomic_t worker_exit;
 
 enum poll_fd {
 static volatile sig_atomic_t worker_exit;
 
 enum poll_fd {


@@ -108,6 +118,8 @@ struct event {
        const char *devpath;
        size_t devpath_len;
        const char *devpath_old;
        const char *devpath;
        size_t devpath_len;
        const char *devpath_old;

+       dev_t devnum;
+       bool is_block;

 };
 
 static struct event *node_to_event(struct udev_list_node *node)
 };
 
 static struct event *node_to_event(struct udev_list_node *node)


@@ -128,6 +140,8 @@ enum worker_state {
 
 struct worker {
        struct udev_list_node node;
 
 struct worker {
        struct udev_list_node node;

+       struct udev *udev;
+       int refcount;

        pid_t pid;
        struct udev_monitor *monitor;
        enum worker_state state;
        pid_t pid;
        struct udev_monitor *monitor;
        enum worker_state state;


@@ -154,7 +168,7 @@ static void event_queue_delete(struct event *event)
        udev_list_node_remove(&event->node);
 
        /* mark as failed, if "add" event returns non-zero */
        udev_list_node_remove(&event->node);
 
        /* mark as failed, if "add" event returns non-zero */

-       if (event->exitcode && strcmp(udev_device_get_action(event->dev), "add") == 0)
+       if (event->exitcode != 0 && strcmp(udev_device_get_action(event->dev), "add") == 0)

                udev_queue_export_device_failed(udev_queue_export, event->dev);
        else
                udev_queue_export_device_finished(udev_queue_export, event->dev);
                udev_queue_export_device_failed(udev_queue_export, event->dev);
        else
                udev_queue_export_device_finished(udev_queue_export, event->dev);


@@ -171,14 +185,27 @@ static void event_sig_handler(int signum)
                _exit(1);
                break;
        case SIGTERM:
                _exit(1);
                break;
        case SIGTERM:

-               worker_exit = 1;
+               worker_exit = true;

                break;
        }
 }
 
                break;
        }
 }
 

+static struct worker *worker_ref(struct worker *worker)
+{
+       worker->refcount++;
+       return worker;
+}
+

 static void worker_unref(struct worker *worker)
 {
 static void worker_unref(struct worker *worker)
 {

+       worker->refcount--;
+       if (worker->refcount > 0)
+               return;
+
+       udev_list_node_remove(&worker->node);

        udev_monitor_unref(worker->monitor);
        udev_monitor_unref(worker->monitor);

+       childs--;
+       info(worker->udev, "worker [%u] cleaned up\n", worker->pid);

        free(worker);
 }
 
        free(worker);
 }
 


@@ -196,11 +223,13 @@ static void worker_new(struct event *event)
        /* allow the main daemon netlink address to send devices to the worker */
        udev_monitor_allow_unicast_sender(worker_monitor, monitor);
        udev_monitor_enable_receiving(worker_monitor);
        /* allow the main daemon netlink address to send devices to the worker */
        udev_monitor_allow_unicast_sender(worker_monitor, monitor);
        udev_monitor_enable_receiving(worker_monitor);

-       util_set_fd_cloexec(udev_monitor_get_fd(worker_monitor));

 
        worker = calloc(1, sizeof(struct worker));
        if (worker == NULL)
                return;
 
        worker = calloc(1, sizeof(struct worker));
        if (worker == NULL)
                return;

+       /* worker + event reference */
+       worker->refcount = 2;
+       worker->udev = event->udev;

 
        pid = fork();
        switch (pid) {
 
        pid = fork();
        switch (pid) {


@@ -244,9 +273,11 @@ static void worker_new(struct event *event)
 
                do {
                        struct udev_event *udev_event;
 
                do {
                        struct udev_event *udev_event;

-                       struct worker_message msg;
+                       struct worker_message msg = {};

                        int err;
                        int err;

+                       int failed = 0;

 
 

+                       info(event->udev, "seq %llu running\n", udev_device_get_seqnum(dev));

                        udev_event = udev_event_new(dev);
                        if (udev_event == NULL)
                                _exit(3);
                        udev_event = udev_event_new(dev);
                        if (udev_event == NULL)
                                _exit(3);


@@ -263,7 +294,8 @@ static void worker_new(struct event *event)
 
                        /* execute RUN= */
                        if (err == 0 && !udev_event->ignore_device && udev_get_run(udev_event->udev))
 
                        /* execute RUN= */
                        if (err == 0 && !udev_event->ignore_device && udev_get_run(udev_event->udev))

-                               udev_event_execute_run(udev_event);
+                               failed = udev_event_execute_run(udev_event,
+                                                               &orig_sigmask);

 
                        /* reset alarm */
                        alarm(0);
 
                        /* reset alarm */
                        alarm(0);


@@ -278,7 +310,10 @@ static void worker_new(struct event *event)
                        udev_monitor_send_device(worker_monitor, NULL, dev);
 
                        /* send back the result of the event execution */
                        udev_monitor_send_device(worker_monitor, NULL, dev);
 
                        /* send back the result of the event execution */

-                       msg.exitcode = err;
+                       if (err != 0)
+                               msg.exitcode = err;
+                       else if (failed != 0)
+                               msg.exitcode = failed;

                        msg.pid = getpid();
                        send(worker_watch[WRITE_END], &msg, sizeof(struct worker_message), 0);
 
                        msg.pid = getpid();
                        send(worker_watch[WRITE_END], &msg, sizeof(struct worker_message), 0);
 


@@ -339,18 +374,17 @@ static void event_run(struct event *event)
                if (worker->state != WORKER_IDLE)
                        continue;
 
                if (worker->state != WORKER_IDLE)
                        continue;
 

-               worker->event = event;
-               worker->state = WORKER_RUNNING;
-               event->state = EVENT_RUNNING;

                count = udev_monitor_send_device(monitor, worker->monitor, event->dev);
                if (count < 0) {
                count = udev_monitor_send_device(monitor, worker->monitor, event->dev);
                if (count < 0) {

-                       event->state = EVENT_QUEUED;
-                       worker->event = NULL;

                        err(event->udev, "worker [%u] did not accept message %zi (%m), kill it\n", worker->pid, count);
                        err(event->udev, "worker [%u] did not accept message %zi (%m), kill it\n", worker->pid, count);

-                       worker->state = WORKER_KILLED;

                        kill(worker->pid, SIGKILL);
                        kill(worker->pid, SIGKILL);

+                       worker->state = WORKER_KILLED;

                        continue;
                }
                        continue;
                }

+               worker_ref(worker);
+               worker->event = event;
+               worker->state = WORKER_RUNNING;
+               event->state = EVENT_RUNNING;

                return;
        }
 
                return;
        }
 


@@ -377,6 +411,8 @@ static void event_queue_insert(struct udev_device *dev)
        event->devpath = udev_device_get_devpath(dev);
        event->devpath_len = strlen(event->devpath);
        event->devpath_old = udev_device_get_devpath_old(dev);
        event->devpath = udev_device_get_devpath(dev);
        event->devpath_len = strlen(event->devpath);
        event->devpath_old = udev_device_get_devpath_old(dev);

+       event->devnum = udev_device_get_devnum(dev);
+       event->is_block = (strcmp("block", udev_device_get_subsystem(dev)) == 0);

 
        udev_queue_export_device_queued(udev_queue_export, dev);
        info(event->udev, "seq %llu queued, '%s' '%s'\n", udev_device_get_seqnum(dev),
 
        udev_queue_export_device_queued(udev_queue_export, dev);
        info(event->udev, "seq %llu queued, '%s' '%s'\n", udev_device_get_seqnum(dev),


@@ -440,7 +476,7 @@ static int mem_size_mb(void)
 }
 
 /* lookup event for identical, parent, child device */
 }
 
 /* lookup event for identical, parent, child device */

-static int devpath_busy(struct event *event)
+static bool is_devpath_busy(struct event *event)

 {
        struct udev_list_node *loop;
        size_t common;
 {
        struct udev_list_node *loop;
        size_t common;


@@ -455,18 +491,21 @@ static int devpath_busy(struct event *event)
 
                /* event we checked earlier still exists, no need to check again */
                if (loop_event->seqnum == event->delaying_seqnum)
 
                /* event we checked earlier still exists, no need to check again */
                if (loop_event->seqnum == event->delaying_seqnum)

-                       return 2;
+                       return true;

 
                /* found ourself, no later event can block us */
                if (loop_event->seqnum >= event->seqnum)
                        break;
 
 
                /* found ourself, no later event can block us */
                if (loop_event->seqnum >= event->seqnum)
                        break;
 

+               /* check major/minor */
+               if (major(event->devnum) != 0 && event->devnum == loop_event->devnum && event->is_block == loop_event->is_block)
+                       return true;
+

                /* check our old name */
                /* check our old name */

-               if (event->devpath_old != NULL)
-                       if (strcmp(loop_event->devpath, event->devpath_old) == 0) {
-                               event->delaying_seqnum = loop_event->seqnum;
-                               return 3;
-                       }
+               if (event->devpath_old != NULL && strcmp(loop_event->devpath, event->devpath_old) == 0) {
+                       event->delaying_seqnum = loop_event->seqnum;
+                       return true;
+               }

 
                /* compare devpath */
                common = MIN(loop_event->devpath_len, event->devpath_len);
 
                /* compare devpath */
                common = MIN(loop_event->devpath_len, event->devpath_len);


@@ -478,26 +517,26 @@ static int devpath_busy(struct event *event)
                /* identical device event found */
                if (loop_event->devpath_len == event->devpath_len) {
                        event->delaying_seqnum = loop_event->seqnum;
                /* identical device event found */
                if (loop_event->devpath_len == event->devpath_len) {
                        event->delaying_seqnum = loop_event->seqnum;

-                       return 4;
+                       return true;

                }
 
                /* parent device event found */
                if (event->devpath[common] == '/') {
                        event->delaying_seqnum = loop_event->seqnum;
                }
 
                /* parent device event found */
                if (event->devpath[common] == '/') {
                        event->delaying_seqnum = loop_event->seqnum;

-                       return 5;
+                       return true;

                }
 
                /* child device event found */
                if (loop_event->devpath[common] == '/') {
                        event->delaying_seqnum = loop_event->seqnum;
                }
 
                /* child device event found */
                if (loop_event->devpath[common] == '/') {
                        event->delaying_seqnum = loop_event->seqnum;

-                       return 6;
+                       return true;

                }
 
                /* no matching device */
                continue;
        }
 
                }
 
                /* no matching device */
                continue;
        }
 

-       return 0;
+       return false;

 }
 
 static void events_start(struct udev *udev)
 }
 
 static void events_start(struct udev *udev)


@@ -511,7 +550,7 @@ static void events_start(struct udev *udev)
                        continue;
 
                /* do not start event if parent or child event is still running */
                        continue;
 
                /* do not start event if parent or child event is still running */

-               if (devpath_busy(event) != 0) {
+               if (is_devpath_busy(event)) {

                        dbg(udev, "delay seq %llu (%s)\n", event->seqnum, event->devpath);
                        continue;
                }
                        dbg(udev, "delay seq %llu (%s)\n", event->seqnum, event->devpath);
                        continue;
                }


@@ -544,6 +583,7 @@ static void worker_returned(void)
                        worker->event = NULL;
                        if (worker->state != WORKER_KILLED)
                                worker->state = WORKER_IDLE;
                        worker->event = NULL;
                        if (worker->state != WORKER_KILLED)
                                worker->state = WORKER_IDLE;

+                       worker_unref(worker);

                        break;
                }
        }
                        break;
                }
        }


@@ -570,17 +610,17 @@ static void handle_ctrl_msg(struct udev_ctrl *uctrl)
 
        if (udev_ctrl_get_stop_exec_queue(ctrl_msg) > 0) {
                info(udev, "udevd message (STOP_EXEC_QUEUE) received\n");
 
        if (udev_ctrl_get_stop_exec_queue(ctrl_msg) > 0) {
                info(udev, "udevd message (STOP_EXEC_QUEUE) received\n");

-               stop_exec_queue = 1;
+               stop_exec_queue = true;

        }
 
        if (udev_ctrl_get_start_exec_queue(ctrl_msg) > 0) {
                info(udev, "udevd message (START_EXEC_QUEUE) received\n");
        }
 
        if (udev_ctrl_get_start_exec_queue(ctrl_msg) > 0) {
                info(udev, "udevd message (START_EXEC_QUEUE) received\n");

-               stop_exec_queue = 0;
+               stop_exec_queue = false;

        }
 
        if (udev_ctrl_get_reload_rules(ctrl_msg) > 0) {
                info(udev, "udevd message (RELOAD_RULES) received\n");
        }
 
        if (udev_ctrl_get_reload_rules(ctrl_msg) > 0) {
                info(udev, "udevd message (RELOAD_RULES) received\n");

-               reload_config = 1;
+               reload_config = true;

        }
 
        str = udev_ctrl_get_set_env(ctrl_msg);
        }
 
        str = udev_ctrl_get_set_env(ctrl_msg);


@@ -628,7 +668,7 @@ static void handle_ctrl_msg(struct udev_ctrl *uctrl)
 /* read inotify messages */
 static int handle_inotify(struct udev *udev)
 {
 /* read inotify messages */
 static int handle_inotify(struct udev *udev)
 {

-       ssize_t nbytes, pos;
+       int nbytes, pos;

        char *buf;
        struct inotify_event *ev;
 
        char *buf;
        struct inotify_event *ev;
 


@@ -649,7 +689,7 @@ static int handle_inotify(struct udev *udev)
                ev = (struct inotify_event *)(buf + pos);
                if (ev->len) {
                        dbg(udev, "inotify event: %x for %s\n", ev->mask, ev->name);
                ev = (struct inotify_event *)(buf + pos);
                if (ev->len) {
                        dbg(udev, "inotify event: %x for %s\n", ev->mask, ev->name);

-                       reload_config = 1;
+                       reload_config = true;

                        continue;
                }
 
                        continue;
                }
 


@@ -684,7 +724,7 @@ static void handle_signal(struct udev *udev, int signo)
        switch (signo) {
        case SIGINT:
        case SIGTERM:
        switch (signo) {
        case SIGINT:
        case SIGTERM:

-               udev_exit = 1;
+               udev_exit = true;

                break;
        case SIGCHLD:
                while (1) {
                break;
        case SIGCHLD:
                while (1) {


@@ -702,23 +742,24 @@ static void handle_signal(struct udev *udev, int signo)
                                if (worker->pid != pid)
                                        continue;
 
                                if (worker->pid != pid)
                                        continue;
 

-                               /* fail event, if worker died unexpectedly */
-                               if (worker->event != NULL) {
-                                       worker->event->exitcode = status;
+                               info(udev, "worker [%u] exit\n", pid);
+                               if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {

                                        err(udev, "worker [%u] unexpectedly returned with status 0x%04x\n", pid, status);
                                        err(udev, "worker [%u] unexpectedly returned with status 0x%04x\n", pid, status);

-                                       event_queue_delete(worker->event);
+                                       if (worker->event != NULL) {
+                                               err(udev, "worker [%u] failed while handling '%s'\n", pid, worker->event->devpath);
+                                               worker->event->exitcode = -32;
+                                               event_queue_delete(worker->event);
+                                               /* drop reference from running event */
+                                               worker_unref(worker);
+                                       }

                                }
                                }

-
-                               udev_list_node_remove(&worker->node);

                                worker_unref(worker);
                                worker_unref(worker);

-                               childs--;
-                               info(udev, "worker [%u] exit\n", pid);

                                break;
                        }
                }
                break;
        case SIGHUP:
                                break;
                        }
                }
                break;
        case SIGHUP:

-               reload_config = 1;
+               reload_config = true;

                break;
        }
 }
                break;
        }
 }


@@ -743,7 +784,7 @@ static void startup_log(struct udev *udev)
                if (f != NULL)
                        fprintf(f, "<3>%s\n", depr_str);
                err(udev, "%s\n", depr_str);
                if (f != NULL)
                        fprintf(f, "<3>%s\n", depr_str);
                err(udev, "%s\n", depr_str);

-               sleep(3);
+               sleep(15);

        }
 
        if (f != NULL)
        }
 
        if (f != NULL)


@@ -756,7 +797,7 @@ int main(int argc, char *argv[])
        int fd;
        sigset_t mask;
        const char *value;
        int fd;
        sigset_t mask;
        const char *value;

-       int daemonize = 0;
+       int daemonize = false;

        int resolve_names = 1;
        static const struct option options[] = {
                { "daemon", no_argument, NULL, 'd' },
        int resolve_names = 1;
        static const struct option options[] = {
                { "daemon", no_argument, NULL, 'd' },


@@ -787,13 +828,13 @@ int main(int argc, char *argv[])
 
                switch (option) {
                case 'd':
 
                switch (option) {
                case 'd':

-                       daemonize = 1;
+                       daemonize = true;

                        break;
                case 't':
                        break;
                case 't':

-                       debug_trace = 1;
+                       debug_trace = true;

                        break;
                case 'D':
                        break;
                case 'D':

-                       debug = 1;
+                       debug = true;

                        if (udev_get_log_priority(udev) < LOG_INFO)
                                udev_set_log_priority(udev, LOG_INFO);
                        break;
                        if (udev_get_log_priority(udev) < LOG_INFO)
                                udev_set_log_priority(udev, LOG_INFO);
                        break;


@@ -893,7 +934,7 @@ int main(int argc, char *argv[])
 
        /* block and listen to all signals on signalfd */
        sigfillset(&mask);
 
        /* block and listen to all signals on signalfd */
        sigfillset(&mask);

-       sigprocmask(SIG_SETMASK, &mask, NULL);
+       sigprocmask(SIG_SETMASK, &mask, &orig_sigmask);

        pfd[FD_SIGNAL].fd = signalfd(-1, &mask, 0);
        if (pfd[FD_SIGNAL].fd < 0) {
                fprintf(stderr, "error getting signalfd\n");
        pfd[FD_SIGNAL].fd = signalfd(-1, &mask, 0);
        if (pfd[FD_SIGNAL].fd < 0) {
                fprintf(stderr, "error getting signalfd\n");


@@ -903,14 +944,13 @@ int main(int argc, char *argv[])
        }
 
        /* unnamed socket from workers to the main daemon */
        }
 
        /* unnamed socket from workers to the main daemon */

-       if (socketpair(AF_LOCAL, SOCK_DGRAM, 0, worker_watch) < 0) {
+       if (socketpair(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0, worker_watch) < 0) {

                fprintf(stderr, "error getting socketpair\n");
                err(udev, "error getting socketpair\n");
                rc = 6;
                goto exit;
        }
        pfd[FD_WORKER].fd = worker_watch[READ_END];
                fprintf(stderr, "error getting socketpair\n");
                err(udev, "error getting socketpair\n");
                rc = 6;
                goto exit;
        }
        pfd[FD_WORKER].fd = worker_watch[READ_END];

-       util_set_fd_cloexec(worker_watch[WRITE_END]);

 
        rules = udev_rules_new(udev, resolve_names);
        if (rules == NULL) {
 
        rules = udev_rules_new(udev, resolve_names);
        if (rules == NULL) {