udevd: set incoming socket buffer SO_RCVBUF to maximum

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index e3ee1457cb894993cf4f33d668953efe06156d32..110d8e7c4d3a3fe90f547f76e252dbba63f0a0e8 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -48,6 +48,10 @@
 #include "udevd.h"
 #include "logging.h"
 
+#ifndef NETLINK_KOBJECT_UEVENT
+#define NETLINK_KOBJECT_UEVENT 15
+#endif
+
 /* global variables*/
 static int udevd_sock;
 static int uevent_netlink_sock;
@@ -101,7 +105,7 @@ static void msg_dump_queue(void)
 #endif
 }
 
-static void run_queue_delete(struct uevent_msg *msg)
+static void msg_queue_delete(struct uevent_msg *msg)
 {
        list_del(&msg->node);
        free(msg);
@@ -163,7 +167,7 @@ static void msg_queue_insert(struct uevent_msg *msg)
 }
 
 /* forks event and removes event from run queue when finished */
-static void execute_udev(struct uevent_msg *msg)
+static void udev_event_fork(struct uevent_msg *msg)
 {
        char *const argv[] = { "udev", msg->subsystem, NULL };
        pid_t pid;
@@ -177,15 +181,13 @@ static void execute_udev(struct uevent_msg *msg)
                        close(uevent_netlink_sock);
                close(udevd_sock);
                logging_close();
-
                setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
                execve(udev_bin, argv, msg->envp);
                err("exec of child failed");
                _exit(1);
-               break;
        case -1:
                err("fork of child failed");
-               run_queue_delete(msg);
+               msg_queue_delete(msg);
                break;
        default:
                /* get SIGCHLD in main loop */
@@ -385,7 +387,7 @@ static void exec_queue_manager(void)
                if (running_with_devpath(loop_msg, max_childs) == 0) {
                        /* move event to run list */
                        list_move_tail(&loop_msg->node, &running_list);
-                       execute_udev(loop_msg);
+                       udev_event_fork(loop_msg);
                        running++;
                        dbg("moved seq %llu to running list", loop_msg->seqnum);
                } else
@@ -453,6 +455,8 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
        int bufpos;
        int i;
        struct uevent_msg *msg;
+       int major = 0;
+       int minor = 0;
 
        msg = malloc(sizeof(struct uevent_msg) + buf_size);
        if (msg == NULL)
@@ -475,22 +479,22 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
                /* remember some keys for further processing */
                if (strncmp(key, "ACTION=", 7) == 0)
                        msg->action = &key[7];
-
-               if (strncmp(key, "DEVPATH=", 8) == 0)
+               else if (strncmp(key, "DEVPATH=", 8) == 0)
                        msg->devpath = &key[8];
-
-               if (strncmp(key, "SUBSYSTEM=", 10) == 0)
+               else if (strncmp(key, "SUBSYSTEM=", 10) == 0)
                        msg->subsystem = &key[10];
-
-               if (strncmp(key, "SEQNUM=", 7) == 0)
+               else if (strncmp(key, "SEQNUM=", 7) == 0)
                        msg->seqnum = strtoull(&key[7], NULL, 10);
-
-               if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
+               else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
                        msg->physdevpath = &key[12];
-
-               if (strncmp(key, "TIMEOUT=", 8) == 0)
+               else if (strncmp(key, "MAJOR=", 6) == 0)
+                       major = strtoull(&key[6], NULL, 10);
+               else if (strncmp(key, "MINOR=", 6) == 0)
+                       minor = strtoull(&key[6], NULL, 10);
+               else if (strncmp(key, "TIMEOUT=", 8) == 0)
                        msg->timeout = strtoull(&key[8], NULL, 10);
        }
+       msg->devt = makedev(major, minor);
        msg->envp[i++] = "UDEVD_EVENT=1";
        msg->envp[i] = NULL;
 
@@ -600,7 +604,7 @@ static struct uevent_msg *get_netlink_msg(void)
        if ((size_t)size > sizeof(buffer)-1)
                size = sizeof(buffer)-1;
        buffer[size] = '\0';
-       dbg("uevent_size=%li", (long)size);
+       dbg("uevent_size=%zi", size);
 
        /* start of event payload */
        bufpos = strlen(buffer)+1;
@@ -675,7 +679,7 @@ static void udev_done(int pid)
                if (msg->pid == pid) {
                        sysinfo(&info);
                        info("seq %llu exit, %ld seconds old", msg->seqnum, info.uptime - msg->queue_time);
-                       run_queue_delete(msg);
+                       msg_queue_delete(msg);
 
                        /* we want to run the exec queue manager since there may
                         * be events waiting with the devpath of the one that
@@ -716,6 +720,7 @@ static void user_sighandler(void)
 static int init_udevd_socket(void)
 {
        struct sockaddr_un saddr;
+       const int buffersize = 1024 * 1024;
        socklen_t addrlen;
        const int feature_on = 1;
        int retval;
@@ -732,6 +737,9 @@ static int init_udevd_socket(void)
                return -1;
        }
 
+       /* set receive buffersize */
+       setsockopt(udevd_sock, SOL_SOCKET, SO_RCVBUF, &buffersize, sizeof(buffersize));
+
        /* the bind takes care of ensuring only one copy running */
        retval = bind(udevd_sock, (struct sockaddr *) &saddr, addrlen);
        if (retval < 0) {
@@ -749,6 +757,7 @@ static int init_udevd_socket(void)
 static int init_uevent_netlink_sock(void)
 {
        struct sockaddr_nl snl;
+       const int buffersize = 1024 * 1024;
        int retval;
 
        memset(&snl, 0x00, sizeof(struct sockaddr_nl));
@@ -762,6 +771,9 @@ static int init_uevent_netlink_sock(void)
                return -1;
        }
 
+       /* set receive buffersize */
+       setsockopt(uevent_netlink_sock, SOL_SOCKET, SO_RCVBUF, &buffersize, sizeof(buffersize));
+
        retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
                      sizeof(struct sockaddr_nl));
        if (retval < 0) {