switch uevent netlink socket to group 1 only

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index b0c38eb41347ada9e082e51b8c25f2f7a801c2ef..751231ee413fd603841d844a4a5ff15f8a1697db 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -250,7 +250,7 @@ static void udev_event_run(struct uevent_msg *msg)
                /* child */
                close(uevent_netlink_sock);
                close(udevd_sock);
-               if (inotify_fd > 0)
+               if (inotify_fd >= 0)
                        close(inotify_fd);
                close(signal_pipe[READ_END]);
                close(signal_pipe[WRITE_END]);
@@ -287,7 +287,7 @@ static void msg_queue_insert(struct uevent_msg *msg)
        strlcpy(filename, udev_root, sizeof(filename));
        strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
        fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
-       if (fd > 0) {
+       if (fd >= 0) {
                char str[32];
                int len;
 
@@ -559,19 +559,17 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
 /* receive the udevd message from userspace */
 static struct uevent_msg *get_udevd_msg(void)
 {
-       static struct udevd_msg usend_msg;
-       struct uevent_msg *msg;
+       static struct udevd_msg ctrl_msg;
        ssize_t size;
        struct msghdr smsg;
        struct cmsghdr *cmsg;
        struct iovec iov;
        struct ucred *cred;
        char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
-       int envbuf_size;
        int *intval;
 
-       memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
-       iov.iov_base = &usend_msg;
+       memset(&ctrl_msg, 0x00, sizeof(struct udevd_msg));
+       iov.iov_base = &ctrl_msg;
        iov.iov_len = sizeof(struct udevd_msg);
 
        memset(&smsg, 0x00, sizeof(struct msghdr));
@@ -599,21 +597,12 @@ static struct uevent_msg *get_udevd_msg(void)
                return NULL;
        }
 
-       if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
-               err("message magic '%s' doesn't match, ignore it", usend_msg.magic);
+       if (strncmp(ctrl_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
+               err("message magic '%s' doesn't match, ignore it", ctrl_msg.magic);
                return NULL;
        }
 
-       switch (usend_msg.type) {
-       case UDEVD_UEVENT_UDEVSEND:
-               info("udevd event message received");
-               envbuf_size = size - offsetof(struct udevd_msg, envbuf);
-               dbg("envbuf_size=%i", envbuf_size);
-               msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size);
-               if (msg == NULL)
-                       return NULL;
-               msg->type = usend_msg.type;
-               return msg;
+       switch (ctrl_msg.type) {
        case UDEVD_STOP_EXEC_QUEUE:
                info("udevd message (STOP_EXEC_QUEUE) received");
                stop_exec_q = 1;
@@ -624,14 +613,14 @@ static struct uevent_msg *get_udevd_msg(void)
                msg_queue_manager();
                break;
        case UDEVD_SET_LOG_LEVEL:
-               intval = (int *) usend_msg.envbuf;
+               intval = (int *) ctrl_msg.envbuf;
                info("udevd message (SET_LOG_PRIORITY) received, udev_log_priority=%i", *intval);
                udev_log_priority = *intval;
                sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
                putenv(udev_log);
                break;
        case UDEVD_SET_MAX_CHILDS:
-               intval = (int *) usend_msg.envbuf;
+               intval = (int *) ctrl_msg.envbuf;
                info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval);
                max_childs = *intval;
                break;
@@ -800,7 +789,7 @@ static int init_uevent_netlink_sock(void)
        memset(&snl, 0x00, sizeof(struct sockaddr_nl));
        snl.nl_family = AF_NETLINK;
        snl.nl_pid = getpid();
-       snl.nl_groups = 0xffffffff;
+       snl.nl_groups = 1;
 
        uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (uevent_netlink_sock == -1) {
@@ -821,6 +810,34 @@ static int init_uevent_netlink_sock(void)
        return 0;
 }
 
+static void export_initial_seqnum(void)
+{
+       char filename[PATH_SIZE];
+       int fd;
+       char seqnum[32];
+       ssize_t len = 0;
+
+       strlcpy(filename, sysfs_path, sizeof(filename));
+       strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+       fd = open(filename, O_RDONLY);
+       if (fd >= 0) {
+               len = read(fd, seqnum, sizeof(seqnum)-1);
+               close(fd);
+       }
+       if (len <= 0) {
+               strcpy(seqnum, "0\n");
+               len = 3;
+       }
+       strlcpy(filename, udev_root, sizeof(filename));
+       strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+       create_path(filename);
+       fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+       if (fd >= 0) {
+               write(fd, seqnum, len);
+               close(fd);
+       }
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
        int retval;
@@ -893,6 +910,8 @@ int main(int argc, char *argv[], char *envp[])
        sysfs_init();
        udev_rules_init(&rules, 1);
 
+       export_initial_seqnum();
+
        if (daemonize) {
                pid_t pid;
 
@@ -1014,7 +1033,7 @@ int main(int argc, char *argv[], char *envp[])
                FD_SET(signal_pipe[READ_END], &readfds);
                FD_SET(udevd_sock, &readfds);
                FD_SET(uevent_netlink_sock, &readfds);
-               if (inotify_fd > 0)
+               if (inotify_fd >= 0)
                        FD_SET(inotify_fd, &readfds);
 
                fdcount = select(maxfd+1, &readfds, NULL, NULL, NULL);
@@ -1046,7 +1065,7 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                /* rules directory inotify watch */
-               if ((inotify_fd > 0) && FD_ISSET(inotify_fd, &readfds)) {
+               if ((inotify_fd >= 0) && FD_ISSET(inotify_fd, &readfds)) {
                        int nbytes;
 
                        /* discard all possible events, we can just reload the config */
@@ -1089,16 +1108,16 @@ exit:
        udev_rules_cleanup(&rules);
        sysfs_cleanup();
 
-       if (signal_pipe[READ_END] > 0)
+       if (signal_pipe[READ_END] >= 0)
                close(signal_pipe[READ_END]);
-       if (signal_pipe[WRITE_END] > 0)
+       if (signal_pipe[WRITE_END] >= 0)
                close(signal_pipe[WRITE_END]);
 
-       if (udevd_sock > 0)
+       if (udevd_sock >= 0)
                close(udevd_sock);
-       if (inotify_fd > 0)
+       if (inotify_fd >= 0)
                close(inotify_fd);
-       if (uevent_netlink_sock > 0)
+       if (uevent_netlink_sock >= 0)
                close(uevent_netlink_sock);
 
        logging_close();