/*
- * udevd.c - event listener and serializer
- *
* Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
*
- *
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation version 2 of the License.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include <fcntl.h>
#include <syslog.h>
#include <time.h>
+#include <getopt.h>
#include <sys/select.h>
#include <sys/wait.h>
#include <sys/types.h>
#include "udevd.h"
#include "udev_selinux.h"
+static int debug_trace;
+static int verbose;
+
static struct udev_rules rules;
static int udevd_sock = -1;
static int uevent_netlink_sock = -1;
return;
va_start(args, format);
- vsyslog(priority, format, args);
+ if (verbose) {
+ printf("[%d] ", (int) getpid());
+ vprintf(format, args);
+ printf("\n");
+ } else
+ vsyslog(priority, format, args);
va_end(args);
}
+
#endif
static void asmlinkage udev_event_sig_handler(int signum)
for (i = 0; msg->envp[i]; i++)
putenv(msg->envp[i]);
- udev = udev_device_init();
+ udev = udev_device_init(NULL);
if (udev == NULL)
return -1;
strlcpy(udev->action, msg->action, sizeof(udev->action));
sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver);
+ udev->devpath_old = msg->devpath_old;
udev->devt = msg->devt;
retval = udev_device_event(&rules, udev);
/* run programs collected by RUN-key*/
- if (retval == 0 && !udev->ignore_device && udev_run) {
- struct name_entry *name_loop;
-
- dbg("executing run list");
- list_for_each_entry(name_loop, &udev->run_list, node) {
- if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
- pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action);
- else {
- char program[PATH_SIZE];
-
- strlcpy(program, name_loop->name, sizeof(program));
- udev_rules_apply_format(udev, program, sizeof(program));
- if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
- (udev_log_priority >= LOG_INFO)))
- retval = -1;
- }
- }
- }
+ if (retval == 0 && !udev->ignore_device && udev_run)
+ retval = udev_rules_run(udev);
udev_device_cleanup(udev);
return retval;
{
char filename[PATH_SIZE];
char filename_failed[PATH_SIZE];
- char target[PATH_SIZE];
- size_t start, end, i;
- struct udevd_uevent_msg *loop_msg;
+ size_t start;
- /* add location of queue files */
- strlcpy(filename, udev_root, sizeof(filename));
- strlcat(filename, "/", sizeof(filename));
- start = strlcat(filename, EVENT_QUEUE_DIR, sizeof(filename));
- end = strlcat(filename, msg->devpath, sizeof(filename));
- if (end > sizeof(filename))
- end = sizeof(filename);
-
- /* replace '/' to transform path into a filename */
- for (i = start+1; i < end; i++)
- if (filename[i] == '/')
- filename[i] = PATH_TO_NAME_CHAR;
-
- /* add location of failed files */
+ /* location of queue file */
+ snprintf(filename, sizeof(filename), "%s/"EVENT_QUEUE_DIR"/%llu", udev_root, msg->seqnum);
+
+ /* location of failed file */
strlcpy(filename_failed, udev_root, sizeof(filename_failed));
strlcat(filename_failed, "/", sizeof(filename_failed));
- start = strlcat(filename_failed, EVENT_FAILED_DIR, sizeof(filename_failed));
- end = strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
- if (end > sizeof(filename_failed))
- end = sizeof(filename_failed);
-
- /* replace '/' to transform path into a filename */
- for (i = start+1; i < end; i++)
- if (filename_failed[i] == '/')
- filename_failed[i] = PATH_TO_NAME_CHAR;
+ start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
+ strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
+ path_encode(&filename_failed[start], sizeof(filename_failed) - start);
switch (state) {
case EVENT_QUEUED:
unlink(filename_failed);
delete_path(filename_failed);
- strlcpy(target, sysfs_path, sizeof(target));
- strlcat(target, msg->devpath, sizeof(target));
create_path(filename);
- symlink(target, filename);
- return;
+ symlink(msg->devpath, filename);
+ break;
case EVENT_FINISHED:
- case EVENT_FAILED:
- unlink(filename_failed);
- delete_path(filename_failed);
-
- /* don't remove, if events for the same path are still pending */
- list_for_each_entry(loop_msg, &running_list, node)
- if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
- return;
-
- list_for_each_entry(loop_msg, &exec_list, node)
- if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
- return;
-
- /* move failed events to the failed directory */
- if (state == EVENT_FAILED) {
- create_path(filename_failed);
- rename(filename, filename_failed);
+ if (msg->devpath_old != NULL) {
+ /* "move" event - rename failed file to current name, do not delete failed */
+ char filename_failed_old[PATH_SIZE];
+
+ strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old));
+ strlcat(filename_failed_old, "/", sizeof(filename_failed_old));
+ start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old));
+ strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old));
+ path_encode(&filename_failed_old[start], sizeof(filename) - start);
+
+ if (rename(filename_failed_old, filename_failed) == 0)
+ info("renamed devpath, moved failed state of '%s' to %s'",
+ msg->devpath_old, msg->devpath);
} else {
- unlink(filename);
+ unlink(filename_failed);
+ delete_path(filename_failed);
}
- /* clean up the queue directory */
+ unlink(filename);
delete_path(filename);
+ break;
+ case EVENT_FAILED:
+ /* move failed event to the failed directory */
+ create_path(filename_failed);
+ rename(filename, filename_failed);
- return;
+ /* clean up possibly empty queue directory */
+ delete_path(filename);
+ break;
}
+
+ return;
}
static void msg_queue_delete(struct udevd_uevent_msg *msg)
{
list_del(&msg->node);
- /* mark as failed, if add event returns non-zero */
+ /* mark as failed, if "add" event returns non-zero */
if (msg->exitstatus && strcmp(msg->action, "add") == 0)
export_event_state(msg, EVENT_FAILED);
else
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
retval = udev_event_process(msg);
- info("seq %llu finished", msg->seqnum);
+ info("seq %llu finished with %i", msg->seqnum, retval);
logging_close();
if (retval)
}
export_event_state(msg, EVENT_QUEUED);
+ info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
+
+ /* run one event after the other in debug mode */
+ if (debug_trace) {
+ list_add_tail(&msg->node, &running_list);
+ udev_event_run(msg);
+ waitpid(msg->pid, NULL, 0);
+ msg_queue_delete(msg);
+ return;
+ }
/* run all events with a timeout set immediately */
if (msg->timeout != 0) {
static int mem_size_mb(void)
{
- int f;
- char buf[8192];
- long int len;
- const char *pos;
- long int memsize;
-
- f = open("/proc/meminfo", O_RDONLY);
- if (f == -1)
- return -1;
-
- len = read(f, buf, sizeof(buf)-1);
- close(f);
+ FILE* f;
+ char buf[4096];
+ long int memsize = -1;
- if (len <= 0)
+ f = fopen("/proc/meminfo", "r");
+ if (f == NULL)
return -1;
- buf[len] = '\0';
- pos = strstr(buf, "MemTotal: ");
- if (pos == NULL)
- return -1;
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ long int value;
- if (sscanf(pos, "MemTotal: %ld kB", &memsize) != 1)
- return -1;
+ if (sscanf(buf, "MemTotal: %ld kB", &value) == 1) {
+ memsize = value / 1024;
+ break;
+ }
+ }
- return memsize / 1024;
+ fclose(f);
+ return memsize;
}
static int cpu_count(void)
{
- int f;
- char buf[32768];
- int len;
- const char *pos;
+ FILE* f;
+ char buf[4096];
int count = 0;
- f = open("/proc/stat", O_RDONLY);
- if (f == -1)
- return -1;
-
- len = read(f, buf, sizeof(buf)-1);
- close(f);
- if (len <= 0)
+ f = fopen("/proc/stat", "r");
+ if (f == NULL)
return -1;
- buf[len] = '\0';
- pos = strstr(buf, "cpu");
- if (pos == NULL)
- return -1;
-
- while (pos != NULL) {
- if (strncmp(pos, "cpu", 3) == 0 &&isdigit(pos[3]))
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3]))
count++;
- pos = strstr(&pos[3], "cpu");
}
+ fclose(f);
if (count == 0)
return -1;
return count;
static int running_processes(void)
{
- int f;
- char buf[32768];
- int len;
- int running;
- const char *pos;
+ FILE* f;
+ char buf[4096];
+ int running = -1;
- f = open("/proc/stat", O_RDONLY);
- if (f == -1)
+ f = fopen("/proc/stat", "r");
+ if (f == NULL)
return -1;
- len = read(f, buf, sizeof(buf)-1);
- close(f);
- if (len <= 0)
- return -1;
- buf[len] = '\0';
-
- pos = strstr(buf, "procs_running ");
- if (pos == NULL)
- return -1;
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ int value;
- if (sscanf(pos, "procs_running %u", &running) != 1)
- return -1;
+ if (sscanf(buf, "procs_running %u", &value) == 1) {
+ running = value;
+ break;
+ }
+ }
+ fclose(f);
return running;
}
return 0;
}
-/* returns still running task for the same device, its parent or its physical device */
-static int running_with_devpath(struct udevd_uevent_msg *msg, int limit)
+/* lookup event for identical, parent, child, or physical device */
+static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
{
struct udevd_uevent_msg *loop_msg;
int childs_count = 0;
+ /* check exec-queue which may still contain delayed events we depend on */
+ list_for_each_entry(loop_msg, &exec_list, node) {
+ /* skip ourself and all later events */
+ if (loop_msg->seqnum >= msg->seqnum)
+ break;
+
+ /* check our old name */
+ if (msg->devpath_old != NULL)
+ if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+ return 2;
+
+ /* check identical, parent, or child device event */
+ if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
+ dbg("%llu, device event still pending %llu (%s)",
+ msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
+ return 3;
+ }
+
+ /* check for our major:minor number */
+ if (msg->devt && loop_msg->devt == msg->devt &&
+ strcmp(msg->subsystem, loop_msg->subsystem) == 0) {
+ dbg("%llu, device event still pending %llu (%d:%d)", msg->seqnum,
+ loop_msg->seqnum, major(loop_msg->devt), minor(loop_msg->devt));
+ return 4;
+ }
+
+ /* check physical device event (special case of parent) */
+ if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
+ if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
+ dbg("%llu, physical device event still pending %llu (%s)",
+ msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
+ return 5;
+ }
+ }
+
+ /* check run queue for still running events */
list_for_each_entry(loop_msg, &running_list, node) {
if (limit && childs_count++ > limit) {
- dbg("%llu, maximum number (%i) of child reached", msg->seqnum, childs_count);
+ dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
return 1;
}
- /* return running parent/child device event */
+ /* check our old name */
+ if (msg->devpath_old != NULL)
+ if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+ return 2;
+
+ /* check identical, parent, or child device event */
if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
- dbg("%llu, child device event still running %llu (%s)",
+ dbg("%llu, device event still running %llu (%s)",
msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
- return 2;
+ return 3;
}
- /* return running physical device event */
+ /* check for our major:minor number */
+ if (msg->devt && loop_msg->devt == msg->devt &&
+ strcmp(msg->subsystem, loop_msg->subsystem) == 0) {
+ dbg("%llu, device event still running %llu (%d:%d)", msg->seqnum,
+ loop_msg->seqnum, major(loop_msg->devt), minor(loop_msg->devt));
+ return 4;
+ }
+
+ /* check physical device event (special case of parent) */
if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
dbg("%llu, physical device event still running %llu (%s)",
msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
- return 3;
+ return 5;
}
}
-
return 0;
}
-/* exec queue management routine executes the events and serializes events in the same sequence */
+/* serializes events for the identical and parent and child devices */
static void msg_queue_manager(void)
{
struct udevd_uevent_msg *loop_msg;
}
}
- /* don't run two processes for the same devpath and wait for the parent*/
- if (running_with_devpath(loop_msg, max_childs)) {
+ /* serialize and wait for parent or child events */
+ if (devpath_busy(loop_msg, max_childs) != 0) {
dbg("delay seq %llu (%s)", loop_msg->seqnum, loop_msg->devpath);
continue;
}
int i;
struct udevd_uevent_msg *msg;
char *physdevdriver_key = NULL;
- int major = 0;
- int minor = 0;
+ int maj = 0;
+ int min = 0;
msg = malloc(sizeof(struct udevd_uevent_msg) + buf_size);
if (msg == NULL)
msg->driver = &key[7];
else if (strncmp(key, "SEQNUM=", 7) == 0)
msg->seqnum = strtoull(&key[7], NULL, 10);
+ else if (strncmp(key, "DEVPATH_OLD=", 12) == 0)
+ msg->devpath_old = &key[12];
else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
msg->physdevpath = &key[12];
else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0)
physdevdriver_key = key;
else if (strncmp(key, "MAJOR=", 6) == 0)
- major = strtoull(&key[6], NULL, 10);
+ maj = strtoull(&key[6], NULL, 10);
else if (strncmp(key, "MINOR=", 6) == 0)
- minor = strtoull(&key[6], NULL, 10);
+ min = 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->devt = makedev(maj, min);
msg->envp[i++] = "UDEVD_EVENT=1";
if (msg->driver == NULL && msg->physdevpath == NULL && physdevdriver_key != NULL) {
struct ucred *cred;
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
int *intval;
+ char *pos;
memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg));
iov.iov_base = &ctrl_msg;
}
switch (ctrl_msg.type) {
+ case UDEVD_CTRL_ENV:
+ pos = strchr(ctrl_msg.buf, '=');
+ if (pos == NULL) {
+ err("wrong key format '%s'", ctrl_msg.buf);
+ break;
+ }
+ pos[0] = '\0';
+ if (pos[1] == '\0') {
+ info("udevd message (ENV) received, unset '%s'", ctrl_msg.buf);
+ unsetenv(ctrl_msg.buf);
+ } else {
+ info("udevd message (ENV) received, set '%s=%s'", ctrl_msg.buf, &pos[1]);
+ setenv(ctrl_msg.buf, &pos[1], 1);
+ }
+ break;
case UDEVD_CTRL_STOP_EXEC_QUEUE:
info("udevd message (STOP_EXEC_QUEUE) received");
stop_exec_q = 1;
saddr.sun_family = AF_LOCAL;
/* use abstract namespace for socket path */
strcpy(&saddr.sun_path[1], UDEVD_CTRL_SOCK_PATH);
- addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+ addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (udevd_sock == -1) {
fd_set readfds;
const char *value;
int daemonize = 0;
- int i;
+ int option;
+ static const struct option options[] = {
+ { "daemon", 0, NULL, 'd' },
+ { "debug-trace", 0, NULL, 't' },
+ { "verbose", 0, NULL, 'v' },
+ { "help", 0, NULL, 'h' },
+ { "version", 0, NULL, 'V' },
+ {}
+ };
int rc = 1;
int maxfd;
selinux_init();
dbg("version %s", UDEV_VERSION);
+ while (1) {
+ option = getopt_long(argc, argv, "dtvhV", options, NULL);
+ if (option == -1)
+ break;
+
+ switch (option) {
+ case 'd':
+ daemonize = 1;
+ break;
+ case 't':
+ debug_trace = 1;
+ break;
+ case 'v':
+ verbose = 1;
+ if (udev_log_priority < LOG_INFO)
+ udev_log_priority = LOG_INFO;
+ break;
+ case 'h':
+ printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--verbose] [--version]\n");
+ goto exit;
+ case 'V':
+ printf("%s\n", UDEV_VERSION);
+ goto exit;
+ default:
+ goto exit;
+ }
+ }
+
if (getuid() != 0) {
fprintf(stderr, "root privileges required\n");
err("root privileges required");
goto exit;
}
- /* parse commandline options */
- for (i = 1 ; i < argc; i++) {
- char *arg = argv[i];
- if (strcmp(arg, "--daemon") == 0 || strcmp(arg, "-d") == 0)
- daemonize = 1;
- else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
- printf("Usage: udevd [--help] [--daemon]\n");
- goto exit;
- } else {
- fprintf(stderr, "unrecognized option '%s'\n", arg);
- err("unrecognized option '%s'\n", arg);
- }
+ /* make sure std{in,out,err} fd's are in a sane state */
+ fd = open("/dev/null", O_RDWR);
+ if (fd < 0) {
+ fprintf(stderr, "cannot open /dev/null\n");
+ err("cannot open /dev/null");
}
+ if (fd > STDIN_FILENO)
+ dup2(fd, STDIN_FILENO);
+ if (write(STDOUT_FILENO, 0, 0) < 0)
+ dup2(fd, STDOUT_FILENO);
+ if (write(STDERR_FILENO, 0, 0) < 0)
+ dup2(fd, STDERR_FILENO);
/* init sockets to receive events */
if (init_udevd_socket() < 0) {
goto exit;
}
+ /* setup signal handler pipe */
+ retval = pipe(signal_pipe);
+ if (retval < 0) {
+ err("error getting pipes: %s", strerror(errno));
+ goto exit;
+ }
+
+ retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+ if (retval < 0) {
+ err("error fcntl on read pipe: %s", strerror(errno));
+ goto exit;
+ }
+ retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
+ if (retval < 0) {
+ err("error fcntl on read pipe: %s", strerror(errno));
+ goto exit;
+ }
+
+ retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+ if (retval < 0) {
+ err("error fcntl on write pipe: %s", strerror(errno));
+ goto exit;
+ }
+ retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
+ if (retval < 0) {
+ err("error fcntl on write pipe: %s", strerror(errno));
+ goto exit;
+ }
+
/* parse the rules and keep them in memory */
sysfs_init();
udev_rules_init(&rules, 1);
}
}
- /* redirect std fd's */
- fd = open("/dev/null", O_RDWR);
- if (fd >= 0) {
- dup2(fd, STDIN_FILENO);
+ /* redirect std{out,err} fd's */
+ if (!verbose)
dup2(fd, STDOUT_FILENO);
- dup2(fd, STDERR_FILENO);
- if (fd > STDERR_FILENO)
- close(fd);
- } else
- err("error opening /dev/null: %s", strerror(errno));
+ dup2(fd, STDERR_FILENO);
+ if (fd > STDERR_FILENO)
+ close(fd);
/* set scheduling priority for the daemon */
setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
close(fd);
}
- /* setup signal handler pipe */
- retval = pipe(signal_pipe);
- if (retval < 0) {
- err("error getting pipes: %s", strerror(errno));
- goto exit;
- }
-
- retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
- if (retval < 0) {
- err("error fcntl on read pipe: %s", strerror(errno));
- goto exit;
- }
- retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
- if (retval < 0) {
- err("error fcntl on read pipe: %s", strerror(errno));
- goto exit;
- }
+ fd = open("/dev/kmsg", O_WRONLY);
+ if (fd > 0) {
+ const char *str = "<6>udevd version " UDEV_VERSION " started\n";
- retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
- if (retval < 0) {
- err("error fcntl on write pipe: %s", strerror(errno));
- goto exit;
- }
- retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
- if (retval < 0) {
- err("error fcntl on write pipe: %s", strerror(errno));
- goto exit;
+ write(fd, str, strlen(str));
+ close(fd);
}
/* set signal handlers */
/* watch rules directory */
inotify_fd = inotify_init();
- if (inotify_fd >= 0)
- inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
- else if (errno == ENOSYS)
- err("the kernel does not support inotify, udevd can't monitor configuration file changes");
+ if (inotify_fd >= 0) {
+ char filename[PATH_MAX];
+
+ inotify_add_watch(inotify_fd, udev_rules_dir, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+
+ /* watch dynamic rules directory */
+ strlcpy(filename, udev_root, sizeof(filename));
+ strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
+ inotify_add_watch(inotify_fd, filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ } else if (errno == ENOSYS)
+ err("the kernel does not support inotify, udevd can't monitor rules file changes");
else
err("inotify_init failed: %s", strerror(errno));
/* export log_priority , as called programs may want to follow that setting */
sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
putenv(udev_log);
+ if (debug_trace)
+ putenv("DEBUG=1");
maxfd = udevd_sock;
maxfd = UDEV_MAX(maxfd, uevent_netlink_sock);
int nbytes;
/* discard all possible events, we can just reload the config */
- if ((ioctl(inotify_fd, FIONREAD, &nbytes) == 0) && nbytes) {
+ if ((ioctl(inotify_fd, FIONREAD, &nbytes) == 0) && nbytes > 0) {
char *buf;
reload_config = 1;
buf = malloc(nbytes);
- if (!buf) {
+ if (buf == NULL) {
err("error getting buffer for inotify, disable watching");
close(inotify_fd);
inotify_fd = -1;
exit:
udev_rules_cleanup(&rules);
sysfs_cleanup();
+ selinux_exit();
if (signal_pipe[READ_END] >= 0)
close(signal_pipe[READ_END]);
~ianmdlvl / elogind.git / blobdiff