[PATCH] udevsend/udevd handle events without a subsystem

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 12fbe1725f07eb29e420f572b581821c94ce616f..58f5be94bc42c43f368e1fe9665e5f34d861ab2b 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -38,11 +38,14 @@
 
 #include "list.h"
 #include "udev.h"
-#include "udev_lib.h"
 #include "udev_version.h"
+#include "udev_utils.h"
 #include "udevd.h"
 #include "logging.h"
 
+/* global variables*/
+static int udevsendsock;
+
 static int pipefds[2];
 static unsigned long long expected_seqnum = 0;
 static volatile int sigchilds_waiting;
@@ -121,13 +124,16 @@ static void msg_queue_insert(struct hotplug_msg *msg)
 /* forks event and removes event from run queue when finished */
 static void udev_run(struct hotplug_msg *msg)
 {
+       char *const argv[] = { "udev", msg->subsystem, NULL };
        pid_t pid;
 
        pid = fork();
        switch (pid) {
        case 0:
                /* child */
-               execle(udev_bin, "udev", msg->subsystem, NULL, msg->envp);
+               close(udevsendsock);
+               logging_close();
+               execve(udev_bin, argv, msg->envp);
                dbg("exec of child failed");
                _exit(1);
                break;
@@ -149,9 +155,14 @@ static void udev_run(struct hotplug_msg *msg)
 static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg)
 {
        struct hotplug_msg *loop_msg;
-       list_for_each_entry(loop_msg, &running_list, list)
-               if (strncmp(loop_msg->devpath, msg->devpath, sizeof(loop_msg->devpath)) == 0)
+       list_for_each_entry(loop_msg, &running_list, list) {
+               if (loop_msg->devpath == NULL || msg->devpath == NULL)
+                       continue;
+
+               if (strcmp(loop_msg->devpath, msg->devpath) == 0)
                        return loop_msg;
+       }
+
        return NULL;
 }
 
@@ -281,7 +292,7 @@ static void handle_udevsend_msg(int sock)
        /* copy environment buffer and reconstruct envp */
        memcpy(msg->envbuf, usend_msg.envbuf, envbuf_size);
        bufpos = 0;
-       for (i = 0; (bufpos < envbuf_size) && (i < HOTPLUG_NUM_ENVP-1); i++) {
+       for (i = 0; (bufpos < envbuf_size) && (i < HOTPLUG_NUM_ENVP-2); i++) {
                int keylen;
                char *key;
 
@@ -304,6 +315,7 @@ static void handle_udevsend_msg(int sock)
                if (strncmp(key, "SEQNUM=", 7) == 0)
                        msg->seqnum = strtoull(&key[7], NULL, 10);
        }
+       msg->envp[i++] = "MANAGED_EVENT=1";
        msg->envp[i] = NULL;
 
        /* if no seqnum is given, we move straight to exec queue */
@@ -397,7 +409,7 @@ static void user_sighandler(void)
 
 int main(int argc, char *argv[], char *envp[])
 {
-       int ssock, maxsockplus;
+       int maxsockplus;
        struct sockaddr_un saddr;
        socklen_t addrlen;
        int retval, fd;
@@ -410,7 +422,7 @@ int main(int argc, char *argv[], char *envp[])
 
        if (getuid() != 0) {
                dbg("need to be root, exit");
-               _exit(1);
+               goto exit;
        }
 
        /* make sure we don't lock any path */
@@ -421,7 +433,7 @@ int main(int argc, char *argv[], char *envp[])
        fd = open( "/dev/null", O_RDWR );
        if ( fd < 0 ) {
                dbg("error opening /dev/null %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
        dup2(fd, 0);
        dup2(fd, 1);
@@ -436,29 +448,29 @@ int main(int argc, char *argv[], char *envp[])
        retval = pipe(pipefds);
        if (retval < 0) {
                dbg("error getting pipes: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
 
        retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
        if (retval < 0) {
                dbg("error fcntl on read pipe: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
        retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
        if (retval < 0) {
                dbg("error fcntl on read pipe: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
 
        retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
        if (retval < 0) {
                dbg("error fcntl on write pipe: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
        retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
        if (retval < 0) {
                dbg("error fcntl on write pipe: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
 
        /* set signal handlers */
@@ -476,28 +488,22 @@ int main(int argc, char *argv[], char *envp[])
        strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
        addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
-       ssock = socket(AF_LOCAL, SOCK_DGRAM, 0);
-       if (ssock == -1) {
+       udevsendsock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+       if (udevsendsock == -1) {
                dbg("error getting socket, exit");
-               exit(1);
+               goto exit;
        }
 
-       set_cloexec_flag(ssock, 1);
-
        /* the bind takes care of ensuring only one copy running */
-       retval = bind(ssock, (struct sockaddr *) &saddr, addrlen);
+       retval = bind(udevsendsock, (struct sockaddr *) &saddr, addrlen);
        if (retval < 0) {
                dbg("bind failed, exit");
+               close(udevsendsock);
                goto exit;
        }
-       retval = fcntl(ssock, F_SETFD, FD_CLOEXEC);
-       if (retval < 0) {
-               dbg("error fcntl on ssock: %s", strerror(errno));
-               exit(1);
-       }
 
        /* enable receiving of the sender credentials */
-       setsockopt(ssock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
+       setsockopt(udevsendsock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
 
        /* possible override of udev binary, used for testing */
        udev_bin = getenv("UDEV_BIN");
@@ -507,9 +513,9 @@ int main(int argc, char *argv[], char *envp[])
                udev_bin = UDEV_BIN;
 
        FD_ZERO(&readfds);
-       FD_SET(ssock, &readfds);
+       FD_SET(udevsendsock, &readfds);
        FD_SET(pipefds[0], &readfds);
-       maxsockplus = ssock+1;
+       maxsockplus = udevsendsock+1;
        while (1) {
                fd_set workreadfds = readfds;
                retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
@@ -520,8 +526,8 @@ int main(int argc, char *argv[], char *envp[])
                        continue;
                }
 
-               if (FD_ISSET(ssock, &workreadfds))
-                       handle_udevsend_msg(ssock);
+               if (FD_ISSET(udevsendsock, &workreadfds))
+                       handle_udevsend_msg(udevsendsock);
 
                if (FD_ISSET(pipefds[0], &workreadfds))
                        user_sighandler();
@@ -547,8 +553,8 @@ int main(int argc, char *argv[], char *envp[])
                        exec_queue_manager();
                }
        }
+
 exit:
-       close(ssock);
        logging_close();
        return 1;
 }