#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;
#endif
}
-static struct hotplug_msg *msg_create(void)
-{
- struct hotplug_msg *new_msg;
-
- new_msg = malloc(sizeof(struct hotplug_msg));
- if (new_msg == NULL)
- dbg("error malloc");
- return new_msg;
-}
-
static void run_queue_delete(struct hotplug_msg *msg)
{
list_del(&msg->list);
static void udev_run(struct hotplug_msg *msg)
{
pid_t pid;
- char action[ACTION_SIZE];
- char devpath[DEVPATH_SIZE];
- char seqnum[SEQNUM_SIZE];
- char *env[] = { action, devpath, seqnum, NULL };
-
- snprintf(action, ACTION_SIZE-1, "ACTION=%s", msg->action);
- action[ACTION_SIZE-1] = '\0';
- snprintf(devpath, DEVPATH_SIZE-1, "DEVPATH=%s", msg->devpath);
- devpath[DEVPATH_SIZE-1] = '\0';
- sprintf(seqnum, "SEQNUM=%llu", msg->seqnum);
pid = fork();
switch (pid) {
case 0:
/* child */
- execle(udev_bin, "udev", msg->subsystem, NULL, env);
+ close(udevsendsock);
+ execle(udev_bin, "udev", msg->subsystem, NULL, msg->envp);
dbg("exec of child failed");
_exit(1);
break;
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;
}
}
/* receive the msg, do some basic sanity checks, and queue it */
-static void handle_msg(int sock)
+static void handle_udevsend_msg(int sock)
{
+ static struct udevsend_msg usend_msg;
struct hotplug_msg *msg;
- int retval;
+ int bufpos;
+ int i;
+ 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;
- msg = msg_create();
- if (msg == NULL) {
- dbg("unable to store message");
- return;
- }
-
- iov.iov_base = msg;
- iov.iov_len = sizeof(struct hotplug_msg);
+ memset(&usend_msg, 0x00, sizeof(struct udevsend_msg));
+ iov.iov_base = &usend_msg;
+ iov.iov_len = sizeof(struct udevsend_msg);
memset(&smsg, 0x00, sizeof(struct msghdr));
smsg.msg_iov = &iov;
smsg.msg_control = cred_msg;
smsg.msg_controllen = sizeof(cred_msg);
- retval = recvmsg(sock, &smsg, 0);
- if (retval < 0) {
+ size = recvmsg(sock, &smsg, 0);
+ if (size < 0) {
if (errno != EINTR)
dbg("unable to receive message");
return;
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
dbg("no sender credentials received, message ignored");
- goto skip;
+ goto exit;
}
if (cred->uid != 0) {
dbg("sender uid=%i, message ignored", cred->uid);
- goto skip;
+ goto exit;
}
- if (strncmp(msg->magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
- dbg("message magic '%s' doesn't match, ignore it", msg->magic);
- goto skip;
+ if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
+ dbg("message magic '%s' doesn't match, ignore it", usend_msg.magic);
+ goto exit;
}
+ envbuf_size = size - offsetof(struct udevsend_msg, envbuf);
+ dbg("envbuf_size=%i", envbuf_size);
+ msg = malloc(sizeof(struct hotplug_msg) + envbuf_size);
+ memset(msg, 0x00, sizeof(struct hotplug_msg) + envbuf_size);
+
+ /* 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++) {
+ int keylen;
+ char *key;
+
+ key = &msg->envbuf[bufpos];
+ keylen = strlen(key);
+ msg->envp[i] = key;
+ bufpos += keylen + 1;
+ dbg("add '%s' to msg.envp[%i]", msg->envp[i], i);
+
+ /* remember some keys for further processing */
+ if (strncmp(key, "ACTION=", 7) == 0)
+ msg->action = &key[7];
+
+ if (strncmp(key, "DEVPATH=", 8) == 0)
+ msg->devpath = &key[8];
+
+ if (strncmp(key, "SUBSYSTEM=", 10) == 0)
+ msg->subsystem = &key[10];
+
+ if (strncmp(key, "SEQNUM=", 7) == 0)
+ msg->seqnum = strtoull(&key[7], NULL, 10);
+ }
+ msg->envp[i] = NULL;
+
/* if no seqnum is given, we move straight to exec queue */
if (msg->seqnum == 0) {
list_add(&msg->list, &exec_list);
} else {
msg_queue_insert(msg);
}
- return;
-skip:
- free(msg);
+exit:
return;
}
sigchilds_waiting = 1;
goto do_write;
break;
- default:
- dbg("unhandled signal %d", signum);
- return;
}
-
+
do_write:
/* if pipe is empty, write to pipe to force select to return
* immediately when it gets called
*/
if (!sig_flag) {
rc = write(pipefds[1],&signum,sizeof(signum));
- if (rc < 0)
- dbg("unable to write to pipe");
- else
+ if (rc >= 0)
sig_flag = 1;
}
}
int main(int argc, char *argv[], char *envp[])
{
- int ssock, maxsockplus;
+ int maxsockplus;
struct sockaddr_un saddr;
socklen_t addrlen;
int retval, fd;
if (getuid() != 0) {
dbg("need to be root, exit");
- _exit(1);
+ goto exit;
}
/* make sure we don't lock any path */
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);
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 */
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");
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);
continue;
}
- if (FD_ISSET(ssock, &workreadfds))
- handle_msg(ssock);
+ if (FD_ISSET(udevsendsock, &workreadfds))
+ handle_udevsend_msg(udevsendsock);
if (FD_ISSET(pipefds[0], &workreadfds))
user_sighandler();
exec_queue_manager();
}
}
+
exit:
- close(ssock);
logging_close();
return 1;
}
~ianmdlvl / elogind.git / blobdiff