[PATCH] PATCH udev close on exec

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index 08212dfee62552cfb8c6bb3edc825c75a707e0b9..23ba1a1b000b206953d95514fc7ab94423486ac7 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -26,22 +26,23 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/un.h>
+#include <time.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>
-#include <time.h>
 #include <linux/stddef.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"
 
 #ifdef LOG
-unsigned char logname[42];
+unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;
@@ -52,42 +53,6 @@ void log_message (int level, const char *format, ...)
 }
 #endif
 
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
-
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
-static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
-                           char *devpath, char *subsystem, int seqnum)
-{
-       memset(msg, 0x00, sizeof(*msg));
-       strfieldcpy(msg->magic, UDEV_MAGIC);
-       msg->seqnum = seqnum;
-       strfieldcpy(msg->action, action);
-       strfieldcpy(msg->devpath, devpath);
-       strfieldcpy(msg->subsystem, subsystem);
-       return sizeof(struct hotplug_msg);
-}
-
 static int start_daemon(void)
 {
        pid_t pid;
@@ -122,6 +87,26 @@ static int start_daemon(void)
        return 0;
 }
 
+static void run_udev(const char *subsystem)
+{
+       pid_t pid;
+
+       pid = fork();
+       switch (pid) {
+       case 0:
+               /* child */
+               execl(UDEV_BIN, "udev", subsystem, NULL);
+               dbg("exec of child failed");
+               exit(1);
+               break;
+       case -1:
+               dbg("fork of child failed");
+               break;
+       default:
+               wait(NULL);
+       }
+}
+
 int main(int argc, char* argv[])
 {
        struct hotplug_msg msg;
@@ -129,22 +114,19 @@ int main(int argc, char* argv[])
        char *devpath;
        char *subsystem;
        char *seqnum;
-       int seq;
+       unsigned long long seq;
        int retval = 1;
-       int size;
        int loop;
        struct timespec tspec;
-       int sock;
+       int sock = -1;
        struct sockaddr_un saddr;
        socklen_t addrlen;
        int started_daemon = 0;
 
-#ifdef DEBUG
        init_logging("udevsend");
-#endif
        dbg("version %s", UDEV_VERSION);
 
-       subsystem = argv[1];
+       subsystem = get_subsystem(argv[1]);
        if (subsystem == NULL) {
                dbg("no subsystem");
                goto exit;
@@ -167,47 +149,54 @@ int main(int argc, char* argv[])
 
        seqnum = get_seqnum();
        if (seqnum == NULL)
-               seq = -1;
+               seq = 0;
        else
-               seq = atoi(seqnum);
-       dbg("SEQNUM = '%d'", seq);
+               seq = strtoull(seqnum, NULL, 10);
+       dbg("SEQNUM = '%llu'", seq);
 
        sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (sock == -1) {
                dbg("error getting socket");
-               goto exit;
+               goto fallback;
        }
 
-       memset(&saddr, 0x00, sizeof(saddr));
+       set_cloexec_flag(sock, 1);
+
+       memset(&saddr, 0x00, sizeof(struct sockaddr_un));
        saddr.sun_family = AF_LOCAL;
        /* use abstract namespace for socket path */
        strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
        addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
-       size = build_hotplugmsg(&msg, action, devpath, subsystem, seq);
+       memset(&msg, 0x00, sizeof(struct hotplug_msg));
+       strcpy(msg.magic, UDEV_MAGIC);
+       msg.seqnum = seq;
+       strfieldcpy(msg.action, action);
+       strfieldcpy(msg.devpath, devpath);
+       strfieldcpy(msg.subsystem, subsystem);
 
        /* If we can't send, try to start daemon and resend message */
        loop = UDEVSEND_CONNECT_RETRY;
        while (loop--) {
-               retval = sendto(sock, &msg, size, 0, (struct sockaddr *)&saddr, addrlen);
+               retval = sendto(sock, &msg, sizeof(struct hotplug_msg), 0,
+                               (struct sockaddr *)&saddr, addrlen);
                if (retval != -1) {
                        retval = 0;
-                       goto close_and_exit;
+                       goto exit;
                }
-               
+
                if (errno != ECONNREFUSED) {
                        dbg("error sending message");
-                       goto close_and_exit;
+                       goto fallback;
                }
-               
+
                if (!started_daemon) {
-                       dbg("connect failed, try starting daemon...");
+                       info("starting udevd daemon");
                        retval = start_daemon();
                        if (retval) {
-                               dbg("error starting daemon");
-                               goto exit;
+                               info("error starting daemon");
+                               goto fallback;
                        }
-                       
                        dbg("daemon started");
                        started_daemon = 1;
                } else {
@@ -217,9 +206,14 @@ int main(int argc, char* argv[])
                        nanosleep(&tspec, NULL);
                }
        }
-       
-close_and_exit:
-       close(sock);
+
+fallback:
+       info("unable to connect to event daemon, try to call udev directly");
+       run_udev(subsystem);
+
 exit:
+       if (sock != -1)
+               close(sock);
+
        return retval;
 }