chiark / gitweb /
udevd: fix udevd read() calls to leave room for null byte
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index 90c34d800a9ca22533f276bf475cd7dc6a450e3a..926c4b526ab5a82dd0107af833f5cfaf8569e98b 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -1,9 +1,8 @@
 /*
  * udev.c
  *
- * Userspace devfs
- *
- * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     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
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+#include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
+#include <syslog.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
+#include "udev_sysfs.h"
 #include "udev_version.h"
+#include "udev_rules.h"
 #include "logging.h"
-#include "namedev.h"
-#include "udevdb.h"
-
-/* global variables */
-char **main_argv;
-char **main_envp;
-
-/* local variables */
-static int is_udevstart;
 
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
-void log_message(int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
 {
        va_list args;
 
-       if (!udev_log)
+       if (priority > udev_log_priority)
                return;
 
        va_start(args, format);
-       vsyslog(level, format, args);
+       vsyslog(priority, format, args);
        va_end(args);
 }
 #endif
 
-asmlinkage static void sig_handler(int signum)
+static void asmlinkage sig_handler(int signum)
 {
        switch (signum) {
+               case SIGALRM:
+                       exit(1);
                case SIGINT:
                case SIGTERM:
-                       udevdb_exit();
                        exit(20 + signum);
-               default:
-                       dbg("unhandled signal %d", signum);
        }
 }
 
-static char *subsystem_blacklist[] = {
-       "scsi_host",
-       "scsi_device",
-       "usb_host",
-       "pci_bus",
-       "pcmcia_socket",
-       ""
-};
-
-int __udev_hotplug(char *action, const char *devpath, const char *subsystem)
+int main(int argc, char *argv[], char *envp[])
 {
-       int retval = -EINVAL;
-       int i;
+       struct udevice udev;
+       struct udev_rules rules;
+       const char *action;
+       const char *devpath;
+       const char *subsystem;
        struct sigaction act;
-       const int nofake = 0;
-
-       dbg("looking at '%s'", devpath);
+       int devnull;
+       int retval = -EINVAL;
 
-       /* we only care about class devices and block stuff */
-       if (!strstr(devpath, "class") &&
-           !strstr(devpath, "block")) {
-               dbg("not a block or class device");
-               goto exit;
+       if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+               printf("%s\n", UDEV_VERSION);
+               exit(0);
        }
 
-       i = 0;
-       while (subsystem_blacklist[i][0] != '\0') {
-               if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
-                       dbg("don't care about '%s' devices", subsystem);
-                       goto exit;
-               }
-               i++;
+       /* set std fd's to /dev/null, if the kernel forks us, we don't have them at all */
+       devnull = open("/dev/null", O_RDWR);
+       if (devnull >= 0)  {
+               if (devnull != STDIN_FILENO)
+                       dup2(devnull, STDIN_FILENO);
+               if (devnull != STDOUT_FILENO)
+                       dup2(devnull, STDOUT_FILENO);
+               if (devnull != STDERR_FILENO)
+                       dup2(devnull, STDERR_FILENO);
+               if (devnull > STDERR_FILENO)
+                       close(devnull);
        }
 
-       /* initialize udev database */
-       retval = udevdb_init(UDEVDB_DEFAULT);
-       if (retval != 0) {
-               dbg("unable to initialize database");
-               goto exit;
-       }
+       logging_init("udev");
+       if (devnull < 0)
+               err("fatal, could not open /dev/null");
+       udev_init_config();
+       dbg("version %s", UDEV_VERSION);
 
        /* set signal handlers */
-       act.sa_handler = sig_handler;
+       memset(&act, 0x00, sizeof(act));
+       act.sa_handler = (void (*)(int)) sig_handler;
        sigemptyset (&act.sa_mask);
-       act.sa_flags = SA_RESTART;
+       act.sa_flags = 0;
+       sigaction(SIGALRM, &act, NULL);
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
-       if (strcmp(action, "add") == 0) {
-               /* Already done. */
-               if (!is_udevstart)
-                       namedev_init();
-               retval = udev_add_device(devpath, subsystem, nofake);
-               goto action_done;
-       }
-
-       if (strcmp(action, "remove") == 0) {
-               retval = udev_remove_device(devpath, subsystem);
-               goto action_done;
-       }
-
-       dbg("unknown action '%s'", action);
-       retval = -EINVAL;
+       /* trigger timeout to prevent hanging processes */
+       alarm(UDEV_ALARM_TIMEOUT);
 
-action_done:
-       udevdb_exit();
+       action = getenv("ACTION");
+       devpath = getenv("DEVPATH");
+       subsystem = getenv("SUBSYSTEM");
+       /* older kernels passed the SUBSYSTEM only as argument */
+       if (!subsystem && argc == 2)
+               subsystem = argv[1];
 
-exit:
-       return retval;
-}
-
-static int udev_hotplug(void)
-{
-       char *action;
-       char *devpath;
-       char *subsystem;
-
-       action = get_action();
-       if (!action) {
-               dbg("no action?");
-               return -EINVAL;
+       if (!action || !subsystem || !devpath) {
+               err("action, subsystem or devpath missing");
+               goto exit;
        }
 
-       devpath = get_devpath();
-       if (!devpath) {
-               dbg("no devpath?");
-               return -EINVAL;
-       }
+       /* export log_priority , as called programs may want to do the same as udev */
+       if (udev_log_priority) {
+               char priority[32];
 
-       /* skip blacklisted subsystems */
-       subsystem = get_subsystem(main_argv[1]);
-       if (!subsystem) {
-               dbg("no subsystem?");
-               return -EINVAL;
+               sprintf(priority, "%i", udev_log_priority);
+               setenv("UDEV_LOG", priority, 1);
        }
 
-       return __udev_hotplug(action, devpath, subsystem);
-}
+       udev_init_device(&udev, devpath, subsystem, action);
+       udev_rules_init(&rules, 1, 0);
 
-int main(int argc, char *argv[], char *envp[])
-{
-       main_argv = argv;
-       main_envp = envp;
+       retval = udev_process_event(&rules, &udev);
 
-       if (strstr(argv[0], "udevstart")) {
-               /* Setup env variables. */
-               setenv("UDEV_NO_SLEEP", "1", 1);
-               is_udevstart = 1;
-       }
+       if (!retval && udev_run && !list_empty(&udev.run_list)) {
+               struct name_entry *name_loop;
 
-       /* initialize our configuration */
-       udev_init_config();
+               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:")], devpath, action);
+                       else
+                               run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+               }
+       }
 
-       dbg("version %s", UDEV_VERSION);
+       udev_rules_close(&rules);
+       udev_cleanup_device(&udev);
 
-       if (is_udevstart) {
-               namedev_init();
-               return udev_start();
-       } else
-               return udev_hotplug();
+exit:
+       logging_close();
+       return retval;
 }