[PATCH] remove some more KLIBC fixups that are no longer needed.

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 476cb64309a2ab9f71caf3ed4f29fb8e23f49516..366c227a3bc9c48c42d1236c4e2fe5006e3cc685 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -114,14 +114,18 @@ static void msg_queue_insert(struct hotplug_msg *msg)
 static void udev_run(struct hotplug_msg *msg)
 {
        pid_t pid;
-       setenv("ACTION", msg->action, 1);
-       setenv("DEVPATH", msg->devpath, 1);
+       char action[32];
+       char devpath[256];
+       char *env[] = { action, devpath, NULL };
+
+       snprintf(action, sizeof(action), "ACTION=%s", msg->action);
+       snprintf(devpath, sizeof(devpath), "DEVPATH=%s", msg->devpath);
 
        pid = fork();
        switch (pid) {
        case 0:
                /* child */
-               execl(UDEV_BIN, "udev", msg->subsystem, NULL);
+               execle(UDEV_BIN, "udev", msg->subsystem, NULL, env);
                dbg("exec of child failed");
                exit(1);
                break;
@@ -218,6 +222,11 @@ static void handle_msg(int sock)
 {
        struct hotplug_msg *msg;
        int retval;
+       struct msghdr smsg;
+       struct cmsghdr *cmsg;
+       struct iovec iov;
+       struct ucred *cred;
+       char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
 
        msg = msg_create();
        if (msg == NULL) {
@@ -225,13 +234,30 @@ static void handle_msg(int sock)
                return;
        }
 
-       retval = recv(sock, msg, sizeof(struct hotplug_msg), 0);
+       iov.iov_base = msg;
+       iov.iov_len = sizeof(struct hotplug_msg);
+
+       memset(&smsg, 0x00, sizeof(struct msghdr));
+       smsg.msg_iov = &iov;
+       smsg.msg_iovlen = 1;
+       smsg.msg_control = cred_msg;
+       smsg.msg_controllen = sizeof(cred_msg);
+
+       retval = recvmsg(sock, &smsg, 0);
        if (retval <  0) {
                if (errno != EINTR)
                        dbg("unable to receive message");
                return;
        }
-       
+       cmsg = CMSG_FIRSTHDR(&smsg);
+       cred = (struct ucred *) CMSG_DATA(cmsg);
+
+       if (cred->uid != 0) {
+               dbg("sender uid=%i, message ignored", cred->uid);
+               free(msg);
+               return;
+       }
+
        if (strncmp(msg->magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
                dbg("message magic '%s' doesn't match, ignore it", msg->magic);
                free(msg);
@@ -285,17 +311,22 @@ int main(int argc, char *argv[])
        struct sockaddr_un saddr;
        socklen_t addrlen;
        int retval;
+       const int on = 1;
+       struct sigaction act;
 
        init_logging("udevd");
 
-       signal(SIGINT, sig_handler);
-       signal(SIGTERM, sig_handler);
-       signal(SIGALRM, sig_handler);
-       signal(SIGCHLD, sig_handler);
+       /* set signal handler */
+       act.sa_handler = sig_handler;
+       sigemptyset (&act.sa_mask);
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
 
        /* we want these two to interrupt system calls */
-       siginterrupt(SIGALRM, 1);
-       siginterrupt(SIGCHLD, 1);
+       act.sa_flags = 0;
+       sigaction(SIGALRM, &act, NULL);
+       sigaction(SIGCHLD, &act, NULL);
 
        memset(&saddr, 0x00, sizeof(saddr));
        saddr.sun_family = AF_LOCAL;
@@ -310,12 +341,15 @@ int main(int argc, char *argv[])
        }
 
        /* the bind takes care of ensuring only one copy running */
-       retval = bind(ssock, &saddr, addrlen);
+       retval = bind(ssock, (struct sockaddr *) &saddr, addrlen);
        if (retval < 0) {
                dbg("bind failed\n");
                goto exit;
        }
 
+       /* enable receiving of the sender credentials */
+       setsockopt(ssock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
+
        while (1) {
                handle_msg(ssock);