#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <string.h>
#include <ctype.h>
#include <fcntl.h>
#include <time.h>
#include <getopt.h>
#include <dirent.h>
+#include <sys/time.h>
#include <sys/prctl.h>
#include <sys/socket.h>
#include <sys/signalfd.h>
#define UDEVD_PRIORITY -4
#define UDEV_PRIORITY -2
-static int debug;
+static bool debug;
static void log_fn(struct udev *udev, int priority,
const char *file, int line, const char *fn,
const char *format, va_list args)
{
if (debug) {
- fprintf(stderr, "[%d] %s: ", (int) getpid(), fn);
- vfprintf(stderr, format, args);
+ char buf[1024];
+ struct timeval tv;
+ struct timezone tz;
+
+ vsnprintf(buf, sizeof(buf), format, args);
+ gettimeofday(&tv, &tz);
+ fprintf(stderr, "%llu.%06u [%u] %s: %s",
+ (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+ (int) getpid(), fn, buf);
} else {
vsyslog(priority, format, args);
}
}
-static int debug_trace;
+static bool debug_trace;
static struct udev_rules *rules;
static struct udev_queue_export *udev_queue_export;
static struct udev_ctrl *udev_ctrl;
static struct udev_monitor *monitor;
static int worker_watch[2];
static pid_t settle_pid;
-static int stop_exec_queue;
-static int reload_config;
+static bool stop_exec_queue;
+static bool reload_config;
static int max_childs;
static int childs;
+static sigset_t orig_sigmask;
static struct udev_list_node event_list;
static struct udev_list_node worker_list;
-static int udev_exit;
+static bool udev_exit;
static volatile sig_atomic_t worker_exit;
enum poll_fd {
const char *devpath;
size_t devpath_len;
const char *devpath_old;
+ dev_t devnum;
+ bool is_block;
};
static struct event *node_to_event(struct udev_list_node *node)
struct worker {
struct udev_list_node node;
+ struct udev *udev;
+ int refcount;
pid_t pid;
struct udev_monitor *monitor;
enum worker_state state;
udev_list_node_remove(&event->node);
/* mark as failed, if "add" event returns non-zero */
- if (event->exitcode && strcmp(udev_device_get_action(event->dev), "add") == 0)
+ if (event->exitcode != 0 && strcmp(udev_device_get_action(event->dev), "remove") != 0)
udev_queue_export_device_failed(udev_queue_export, event->dev);
else
udev_queue_export_device_finished(udev_queue_export, event->dev);
+ info(event->udev, "seq %llu done with %i\n", udev_device_get_seqnum(event->dev), event->exitcode);
udev_device_unref(event->dev);
free(event);
}
_exit(1);
break;
case SIGTERM:
- worker_exit = 1;
+ worker_exit = true;
break;
}
}
+static struct worker *worker_ref(struct worker *worker)
+{
+ worker->refcount++;
+ return worker;
+}
+
static void worker_unref(struct worker *worker)
{
+ worker->refcount--;
+ if (worker->refcount > 0)
+ return;
+
+ udev_list_node_remove(&worker->node);
udev_monitor_unref(worker->monitor);
+ childs--;
+ info(worker->udev, "worker [%u] cleaned up\n", worker->pid);
free(worker);
}
/* allow the main daemon netlink address to send devices to the worker */
udev_monitor_allow_unicast_sender(worker_monitor, monitor);
udev_monitor_enable_receiving(worker_monitor);
- util_set_fd_cloexec(udev_monitor_get_fd(worker_monitor));
worker = calloc(1, sizeof(struct worker));
if (worker == NULL)
return;
+ /* worker + event reference */
+ worker->refcount = 2;
+ worker->udev = event->udev;
pid = fork();
switch (pid) {
case 0: {
- sigset_t mask;
+ sigset_t sigmask;
struct udev_device *dev;
+ struct pollfd pmon = {
+ .fd = udev_monitor_get_fd(worker_monitor),
+ .events = POLLIN,
+ };
udev_queue_export_unref(udev_queue_export);
udev_monitor_unref(monitor);
udev_ctrl_unref(udev_ctrl);
close(pfd[FD_SIGNAL].fd);
close(worker_watch[READ_END]);
- logging_close();
- logging_init("udevd-work");
+ udev_log_close();
+ udev_log_init("udevd-work");
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
/* set signal handlers */
sigaction(SIGTERM, &act, NULL);
sigaction(SIGALRM, &act, NULL);
- /* unblock signals */
- sigfillset(&mask);
- sigdelset(&mask, SIGTERM);
- sigdelset(&mask, SIGALRM);
- sigprocmask(SIG_SETMASK, &mask, NULL);
+ /* unblock SIGALRM */
+ sigfillset(&sigmask);
+ sigdelset(&sigmask, SIGALRM);
+ sigprocmask(SIG_SETMASK, &sigmask, NULL);
+ /* SIGTERM is unblocked in ppoll() */
+ sigdelset(&sigmask, SIGTERM);
/* request TERM signal if parent exits */
prctl(PR_SET_PDEATHSIG, SIGTERM);
/* initial device */
dev = event->dev;
- while (!worker_exit) {
+ do {
struct udev_event *udev_event;
- struct worker_message msg;
+ struct worker_message msg = {};
int err;
+ int failed = 0;
+ info(event->udev, "seq %llu running\n", udev_device_get_seqnum(dev));
udev_event = udev_event_new(dev);
if (udev_event == NULL)
_exit(3);
if (udev_device_get_event_timeout(dev) >= 0)
alarm(udev_device_get_event_timeout(dev));
- /* execute RUN= */
- if (err == 0 && !udev_event->ignore_device && udev_get_run(udev_event->udev))
- udev_event_execute_run(udev_event);
+ if (err == 0)
+ failed = udev_event_execute_run(udev_event, &orig_sigmask);
- /* reset alarm */
alarm(0);
/* apply/restore inotify watch */
/* send processed event back to libudev listeners */
udev_monitor_send_device(worker_monitor, NULL, dev);
- info(event->udev, "seq %llu finished with %i\n", udev_device_get_seqnum(dev), err);
- udev_device_unref(dev);
- udev_event_unref(udev_event);
-
- /* send back the result of the event execution */
- msg.exitcode = err;
+ /* send udevd the result of the event execution */
+ if (err != 0)
+ msg.exitcode = err;
+ else if (failed != 0)
+ msg.exitcode = failed;
msg.pid = getpid();
send(worker_watch[WRITE_END], &msg, sizeof(struct worker_message), 0);
- /* wait for more device messages from udevd */
- do
- dev = udev_monitor_receive_device(worker_monitor);
- while (!worker_exit && dev == NULL);
- }
+ info(event->udev, "seq %llu processed with %i\n", udev_device_get_seqnum(dev), err);
+ udev_event_unref(udev_event);
+ udev_device_unref(dev);
+ dev = NULL;
+
+ /* wait for more device messages or signal from udevd */
+ while (!worker_exit) {
+ int fdcount;
+
+ fdcount = ppoll(&pmon, 1, NULL, &sigmask);
+ if (fdcount < 0)
+ continue;
+
+ if (pmon.revents & POLLIN) {
+ dev = udev_monitor_receive_device(worker_monitor);
+ if (dev != NULL)
+ break;
+ }
+ }
+ } while (dev != NULL);
udev_monitor_unref(worker_monitor);
- logging_close();
+ udev_log_close();
exit(0);
}
case -1:
event->state = EVENT_RUNNING;
udev_list_node_append(&worker->node, &worker_list);
childs++;
+ info(event->udev, "seq %llu forked new worker [%u]\n", udev_device_get_seqnum(event->dev), pid);
break;
}
}
-static void event_run(struct event *event)
+static void event_run(struct event *event, bool force)
{
struct udev_list_node *loop;
if (worker->state != WORKER_IDLE)
continue;
- worker->event = event;
- worker->state = WORKER_RUNNING;
- event->state = EVENT_RUNNING;
count = udev_monitor_send_device(monitor, worker->monitor, event->dev);
if (count < 0) {
- err(event->udev, "worker [%u] did not accept message, kill it\n", worker->pid);
- event->state = EVENT_QUEUED;
- worker->state = WORKER_KILLED;
+ err(event->udev, "worker [%u] did not accept message %zi (%m), kill it\n", worker->pid, count);
kill(worker->pid, SIGKILL);
+ worker->state = WORKER_KILLED;
continue;
}
+ worker_ref(worker);
+ worker->event = event;
+ worker->state = WORKER_RUNNING;
+ event->state = EVENT_RUNNING;
return;
}
- if (childs >= max_childs) {
+ if (!force && childs >= max_childs) {
info(event->udev, "maximum number (%i) of childs reached\n", childs);
return;
}
event->devpath = udev_device_get_devpath(dev);
event->devpath_len = strlen(event->devpath);
event->devpath_old = udev_device_get_devpath_old(dev);
+ event->devnum = udev_device_get_devnum(dev);
+ event->is_block = (strcmp("block", udev_device_get_subsystem(dev)) == 0);
udev_queue_export_device_queued(udev_queue_export, dev);
info(event->udev, "seq %llu queued, '%s' '%s'\n", udev_device_get_seqnum(dev),
/* run all events with a timeout set immediately */
if (udev_device_get_timeout(dev) > 0) {
- worker_new(event);
+ event_run(event, true);
return;
}
}
-static void worker_kill(int retain)
+static void worker_kill(struct udev *udev, int retain)
{
struct udev_list_node *loop;
int max;
}
}
-static int mem_size_mb(void)
-{
- FILE *f;
- char buf[4096];
- long int memsize = -1;
-
- f = fopen("/proc/meminfo", "r");
- if (f == NULL)
- return -1;
-
- while (fgets(buf, sizeof(buf), f) != NULL) {
- long int value;
-
- if (sscanf(buf, "MemTotal: %ld kB", &value) == 1) {
- memsize = value / 1024;
- break;
- }
- }
-
- fclose(f);
- return memsize;
-}
-
/* lookup event for identical, parent, child device */
-static int devpath_busy(struct event *event)
+static bool is_devpath_busy(struct event *event)
{
struct udev_list_node *loop;
size_t common;
/* event we checked earlier still exists, no need to check again */
if (loop_event->seqnum == event->delaying_seqnum)
- return 2;
+ return true;
/* found ourself, no later event can block us */
if (loop_event->seqnum >= event->seqnum)
break;
+ /* check major/minor */
+ if (major(event->devnum) != 0 && event->devnum == loop_event->devnum && event->is_block == loop_event->is_block)
+ return true;
+
/* check our old name */
- if (event->devpath_old != NULL)
- if (strcmp(loop_event->devpath, event->devpath_old) == 0) {
- event->delaying_seqnum = loop_event->seqnum;
- return 3;
- }
+ if (event->devpath_old != NULL && strcmp(loop_event->devpath, event->devpath_old) == 0) {
+ event->delaying_seqnum = loop_event->seqnum;
+ return true;
+ }
/* compare devpath */
common = MIN(loop_event->devpath_len, event->devpath_len);
/* identical device event found */
if (loop_event->devpath_len == event->devpath_len) {
event->delaying_seqnum = loop_event->seqnum;
- return 4;
+ return true;
}
/* parent device event found */
if (event->devpath[common] == '/') {
event->delaying_seqnum = loop_event->seqnum;
- return 5;
+ return true;
}
/* child device event found */
if (loop_event->devpath[common] == '/') {
event->delaying_seqnum = loop_event->seqnum;
- return 6;
+ return true;
}
/* no matching device */
continue;
}
- return 0;
+ return false;
}
static void events_start(struct udev *udev)
continue;
/* do not start event if parent or child event is still running */
- if (devpath_busy(event) != 0) {
+ if (is_devpath_busy(event)) {
dbg(udev, "delay seq %llu (%s)\n", event->seqnum, event->devpath);
continue;
}
- event_run(event);
+ event_run(event, false);
}
}
worker->event->exitcode = msg.exitcode;
event_queue_delete(worker->event);
worker->event = NULL;
- worker->state = WORKER_IDLE;
+ if (worker->state != WORKER_KILLED)
+ worker->state = WORKER_IDLE;
+ worker_unref(worker);
break;
}
}
if (i >= 0) {
info(udev, "udevd message (SET_LOG_PRIORITY) received, log_priority=%i\n", i);
udev_set_log_priority(udev, i);
- worker_kill(0);
+ worker_kill(udev, 0);
}
if (udev_ctrl_get_stop_exec_queue(ctrl_msg) > 0) {
info(udev, "udevd message (STOP_EXEC_QUEUE) received\n");
- stop_exec_queue = 1;
+ stop_exec_queue = true;
}
if (udev_ctrl_get_start_exec_queue(ctrl_msg) > 0) {
info(udev, "udevd message (START_EXEC_QUEUE) received\n");
- stop_exec_queue = 0;
+ stop_exec_queue = false;
}
if (udev_ctrl_get_reload_rules(ctrl_msg) > 0) {
info(udev, "udevd message (RELOAD_RULES) received\n");
- reload_config = 1;
+ reload_config = true;
}
str = udev_ctrl_get_set_env(ctrl_msg);
}
free(key);
}
- worker_kill(0);
+ worker_kill(udev, 0);
}
i = udev_ctrl_get_set_max_childs(ctrl_msg);
/* read inotify messages */
static int handle_inotify(struct udev *udev)
{
- ssize_t nbytes, pos;
+ int nbytes, pos;
char *buf;
struct inotify_event *ev;
buf = malloc(nbytes);
if (buf == NULL) {
- err(udev, "error getting buffer for inotify, disable watching\n");
+ err(udev, "error getting buffer for inotify\n");
return -1;
}
ev = (struct inotify_event *)(buf + pos);
if (ev->len) {
- dbg(udev, "inotify event: %x for %s\n", ev->mask, ev->name);
- reload_config = 1;
+ const char *s;
+
+ info(udev, "inotify event: %x for %s\n", ev->mask, ev->name);
+ s = strstr(ev->name, ".rules");
+ if (s == NULL)
+ continue;
+ if (strlen(s) != strlen(".rules"))
+ continue;
+ reload_config = true;
continue;
}
dev = udev_watch_lookup(udev, ev->wd);
if (dev != NULL) {
- dbg(udev, "inotify event: %x for %s\n", ev->mask, udev_device_get_devnode(dev));
+ info(udev, "inotify event: %x for %s\n", ev->mask, udev_device_get_devnode(dev));
if (ev->mask & IN_CLOSE_WRITE) {
char filename[UTIL_PATH_SIZE];
int fd;
return 0;
}
-static void handle_signal(int signo)
+static void handle_signal(struct udev *udev, int signo)
{
switch (signo) {
case SIGINT:
case SIGTERM:
- udev_exit = 1;
+ udev_exit = true;
break;
case SIGCHLD:
while (1) {
pid_t pid;
+ int status;
struct udev_list_node *loop, *tmp;
- pid = waitpid(-1, NULL, WNOHANG);
+ pid = waitpid(-1, &status, WNOHANG);
if (pid <= 0)
break;
if (worker->pid != pid)
continue;
- /* fail event, if worker died unexpectedly */
- if (worker->event != NULL) {
- worker->event->exitcode = 127;
- event_queue_delete(worker->event);
+ info(udev, "worker [%u] exit\n", pid);
+ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+ err(udev, "worker [%u] unexpectedly returned with status 0x%04x\n", pid, status);
+ if (worker->event != NULL) {
+ err(udev, "worker [%u] failed while handling '%s'\n", pid, worker->event->devpath);
+ worker->event->exitcode = -32;
+ event_queue_delete(worker->event);
+ /* drop reference from running event */
+ worker_unref(worker);
+ }
}
-
- udev_list_node_remove(&worker->node);
worker_unref(worker);
- childs--;
break;
}
}
break;
case SIGHUP:
- reload_config = 1;
+ reload_config = true;
break;
}
}
-static void startup_log(struct udev *udev)
+static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth)
+{
+ struct dirent *dent;
+
+ for (dent = readdir(dir_from); dent != NULL; dent = readdir(dir_from)) {
+ struct stat stats;
+
+ if (dent->d_name[0] == '.')
+ continue;
+ if (fstatat(dirfd(dir_from), dent->d_name, &stats, AT_SYMLINK_NOFOLLOW) != 0)
+ continue;
+
+ if (S_ISBLK(stats.st_mode) || S_ISCHR(stats.st_mode)) {
+ udev_selinux_setfscreateconat(udev, dirfd(dir_to), dent->d_name, stats.st_mode & 0777);
+ if (mknodat(dirfd(dir_to), dent->d_name, stats.st_mode, stats.st_rdev) == 0) {
+ fchmodat(dirfd(dir_to), dent->d_name, stats.st_mode & 0777, 0);
+ fchownat(dirfd(dir_to), dent->d_name, stats.st_uid, stats.st_gid, 0);
+ } else {
+ utimensat(dirfd(dir_to), dent->d_name, NULL, 0);
+ }
+ udev_selinux_resetfscreatecon(udev);
+ } else if (S_ISLNK(stats.st_mode)) {
+ char target[UTIL_PATH_SIZE];
+ ssize_t len;
+
+ len = readlinkat(dirfd(dir_from), dent->d_name, target, sizeof(target));
+ if (len <= 0 || len == (ssize_t)sizeof(target))
+ continue;
+ target[len] = '\0';
+ udev_selinux_setfscreateconat(udev, dirfd(dir_to), dent->d_name, S_IFLNK);
+ if (symlinkat(target, dirfd(dir_to), dent->d_name) < 0 && errno == EEXIST)
+ utimensat(dirfd(dir_to), dent->d_name, NULL, AT_SYMLINK_NOFOLLOW);
+ udev_selinux_resetfscreatecon(udev);
+ } else if (S_ISDIR(stats.st_mode)) {
+ DIR *dir2_from, *dir2_to;
+
+ if (maxdepth == 0)
+ continue;
+
+ udev_selinux_setfscreateconat(udev, dirfd(dir_to), dent->d_name, S_IFDIR|0755);
+ mkdirat(dirfd(dir_to), dent->d_name, 0755);
+ udev_selinux_resetfscreatecon(udev);
+
+ dir2_to = fdopendir(openat(dirfd(dir_to), dent->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC));
+ if (dir2_to == NULL)
+ continue;
+
+ dir2_from = fdopendir(openat(dirfd(dir_from), dent->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC));
+ if (dir2_from == NULL) {
+ closedir(dir2_to);
+ continue;
+ }
+
+ copy_dir(udev, dir2_from, dir2_to, maxdepth-1);
+
+ closedir(dir2_to);
+ closedir(dir2_from);
+ }
+ }
+
+ return 0;
+}
+
+static void prepare_dev(struct udev *udev)
+{
+ struct stdlinks {
+ const char *link;
+ const char *target;
+ };
+ static const struct stdlinks stdlinks[] = {
+ { "core", "/proc/kcore" },
+ { "fd", "/proc/fd" },
+ { "stdin", "/proc/self/fd/0" },
+ { "stdout", "/proc/self/fd/1" },
+ { "stderr", "/proc/self/fd/2" },
+ };
+ unsigned int i;
+ DIR *dir_from, *dir_to;
+
+ dir_to = opendir(udev_get_dev_path(udev));
+ if (dir_to == NULL)
+ return;
+
+ /* create standard symlinks to /proc */
+ for (i = 0; i < ARRAY_SIZE(stdlinks); i++) {
+ udev_selinux_setfscreateconat(udev, dirfd(dir_to), stdlinks[i].link, S_IFLNK);
+ if (symlinkat(stdlinks[i].target, dirfd(dir_to), stdlinks[i].link) < 0 && errno == EEXIST)
+ utimensat(dirfd(dir_to), stdlinks[i].link, NULL, AT_SYMLINK_NOFOLLOW);
+ udev_selinux_resetfscreatecon(udev);
+ }
+
+ /* copy content from /lib/udev/devices to /dev */
+ dir_from = opendir(LIBEXECDIR "/devices");
+ if (dir_from != NULL) {
+ copy_dir(udev, dir_from, dir_to, 8);
+ closedir(dir_from);
+ }
+
+ closedir(dir_to);
+}
+
+static int mem_size_mb(void)
{
FILE *f;
- char path[UTIL_PATH_SIZE];
- struct stat statbuf;
+ char buf[4096];
+ long int memsize = -1;
- f = fopen("/dev/kmsg", "w");
- if (f != NULL)
- fprintf(f, "<6>udev: starting version " VERSION "\n");
+ f = fopen("/proc/meminfo", "r");
+ if (f == NULL)
+ return -1;
- util_strscpyl(path, sizeof(path), udev_get_sys_path(udev), "/class/mem/null", NULL);
- if (lstat(path, &statbuf) == 0 && S_ISDIR(statbuf.st_mode)) {
- const char *depr_str =
- "udev: missing sysfs features; please update the kernel "
- "or disable the kernel's CONFIG_SYSFS_DEPRECATED option; "
- "udev may fail to work correctly";
-
- if (f != NULL)
- fprintf(f, "<3>%s\n", depr_str);
- err(udev, "%s\n", depr_str);
- sleep(3);
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ long int value;
+
+ if (sscanf(buf, "MemTotal: %ld kB", &value) == 1) {
+ memsize = value / 1024;
+ break;
+ }
}
- if (f != NULL)
- fclose(f);
+ fclose(f);
+ return memsize;
}
int main(int argc, char *argv[])
{
struct udev *udev;
int fd;
+ FILE *f;
sigset_t mask;
const char *value;
- int daemonize = 0;
+ int daemonize = false;
int resolve_names = 1;
static const struct option options[] = {
{ "daemon", no_argument, NULL, 'd' },
if (udev == NULL)
goto exit;
- logging_init("udevd");
+ udev_log_init("udevd");
udev_set_log_fn(udev, log_fn);
info(udev, "version %s\n", VERSION);
udev_selinux_init(udev);
switch (option) {
case 'd':
- daemonize = 1;
+ daemonize = true;
break;
case 't':
- debug_trace = 1;
+ debug_trace = true;
break;
case 'D':
- debug = 1;
+ debug = true;
if (udev_get_log_priority(udev) < LOG_INFO)
udev_set_log_priority(udev, LOG_INFO);
break;
if (write(STDERR_FILENO, 0, 0) < 0)
dup2(fd, STDERR_FILENO);
+ prepare_dev(udev);
+
/* init control socket, bind() ensures, that only one udevd instance is running */
udev_ctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
if (udev_ctrl == NULL) {
if (udev_get_rules_path(udev) != NULL) {
inotify_add_watch(pfd[FD_INOTIFY].fd, udev_get_rules_path(udev),
- IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
} else {
char filename[UTIL_PATH_SIZE];
+ struct stat statbuf;
- inotify_add_watch(pfd[FD_INOTIFY].fd, UDEV_PREFIX "/lib/udev/rules.d",
- IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ inotify_add_watch(pfd[FD_INOTIFY].fd, LIBEXECDIR "/rules.d",
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
inotify_add_watch(pfd[FD_INOTIFY].fd, SYSCONFDIR "/udev/rules.d",
- IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
/* watch dynamic rules directory */
util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/rules.d", NULL);
+ if (stat(filename, &statbuf) != 0) {
+ util_create_path(udev, filename);
+ udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755);
+ mkdir(filename, 0755);
+ udev_selinux_resetfscreatecon(udev);
+ }
inotify_add_watch(pfd[FD_INOTIFY].fd, filename,
- IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
}
udev_watch_restore(udev);
/* block and listen to all signals on signalfd */
sigfillset(&mask);
- sigprocmask(SIG_SETMASK, &mask, NULL);
+ sigprocmask(SIG_SETMASK, &mask, &orig_sigmask);
pfd[FD_SIGNAL].fd = signalfd(-1, &mask, 0);
if (pfd[FD_SIGNAL].fd < 0) {
fprintf(stderr, "error getting signalfd\n");
}
/* unnamed socket from workers to the main daemon */
- if (socketpair(AF_LOCAL, SOCK_DGRAM, 0, worker_watch) < 0) {
+ if (socketpair(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0, worker_watch) < 0) {
fprintf(stderr, "error getting socketpair\n");
err(udev, "error getting socketpair\n");
rc = 6;
goto exit;
}
pfd[FD_WORKER].fd = worker_watch[READ_END];
- util_set_fd_cloexec(worker_watch[WRITE_END]);
rules = udev_rules_new(udev, resolve_names);
if (rules == NULL) {
}
}
- startup_log(udev);
+ f = fopen("/dev/kmsg", "w");
+ if (f != NULL) {
+ fprintf(f, "<6>udev: starting version " VERSION "\n");
+ fclose(f);
+ }
/* redirect std{out,err} */
if (!debug && !debug_trace) {
/* OOM_DISABLE == -17 */
fd = open("/proc/self/oom_adj", O_RDWR);
- if (fd < 0)
+ if (fd < 0) {
err(udev, "error disabling OOM: %m\n");
- else {
+ } else {
write(fd, "-17", 3);
close(fd);
}
/* timeout - kill idle workers */
if (fdcount == 0)
- worker_kill(2);
+ worker_kill(udev, 2);
/* event has finished */
if (pfd[FD_WORKER].revents & POLLIN)
size = read(pfd[FD_SIGNAL].fd, &fdsi, sizeof(struct signalfd_siginfo));
if (size == sizeof(struct signalfd_siginfo))
- handle_signal(fdsi.ssi_signo);
+ handle_signal(udev, fdsi.ssi_signo);
}
/* device node and rules directory inotify watch */
if (reload_config) {
struct udev_rules *rules_new;
- worker_kill(0);
+ worker_kill(udev, 0);
rules_new = udev_rules_new(udev, resolve_names);
if (rules_new != NULL) {
udev_rules_unref(rules);
udev_monitor_unref(monitor);
udev_selinux_exit(udev);
udev_unref(udev);
- logging_close();
+ udev_log_close();
return rc;
}
~ianmdlvl / elogind.git / blobdiff