[PATCH] Exit, if udevtest cannot open the device (segfault).

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 114ca0a52bdfb40d04205c9954ba34e094dd70f7..cac60fd932bfcff1e3b72d2db1e6431fd73fba0e 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -27,15 +27,20 @@
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_lib.h"
+#include "udev_sysfs.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 
+/* timeout flag for udevdb */
+extern sig_atomic_t gotalarm;
+
 /* global variables */
 char **main_argv;
 char **main_envp;
@@ -55,9 +60,13 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-asmlinkage static void sig_handler(int signum)
+static void asmlinkage sig_handler(int signum)
 {
        switch (signum) {
+               case SIGALRM:
+                       gotalarm = 1;
+                       info("error: timeout reached, event probably not handled correctly");
+                       break;
                case SIGINT:
                case SIGTERM:
                        udevdb_exit();
@@ -67,24 +76,12 @@ asmlinkage static void sig_handler(int signum)
        }
 }
 
-static char *subsystem_blacklist[] = {
-       "scsi_host",
-       "scsi_device",
-       "usb_host",
-       "pci_bus",
-       "pcmcia_socket",
-       ""
-};
-
 int main(int argc, char *argv[], char *envp[])
 {
-       main_argv = argv;
-       main_envp = envp;
        struct sigaction act;
-       char *action;
-       char *devpath = "";
-       char *subsystem = "";
-       int i;
+       struct sysfs_class_device *class_dev;
+       struct udevice udev;
+       char path[SYSFS_PATH_MAX];
        int retval = -EINVAL;
        enum {
                ADD,
@@ -94,13 +91,20 @@ int main(int argc, char *argv[], char *envp[])
 
        dbg("version %s", UDEV_VERSION);
 
-       /* initialize our configuration */
+       main_argv = argv;
+       main_envp = envp;
+
+       logging_init("udev");
+
        udev_init_config();
 
        if (strstr(argv[0], "udevstart")) {
                act_type = UDEVSTART;
        } else {
-               action = get_action();
+               const char *action = get_action();
+               const char *devpath = get_devpath();
+               const char *subsystem = get_subsystem(main_argv[1]);
+
                if (!action) {
                        dbg("no action?");
                        goto exit;
@@ -110,11 +114,10 @@ int main(int argc, char *argv[], char *envp[])
                } else if (strcmp(action, "remove") == 0) {
                        act_type = REMOVE;
                } else {
-                       dbg("unknown action '%s'", action);
+                       dbg("no action '%s' for us", action);
                        goto exit;
                }
 
-               devpath = get_devpath();
                if (!devpath) {
                        dbg("no devpath?");
                        goto exit;
@@ -122,60 +125,83 @@ int main(int argc, char *argv[], char *envp[])
                dbg("looking at '%s'", devpath);
 
                /* we only care about class devices and block stuff */
-               if (strstr(devpath, "class") && strstr(devpath, "block")) {
+               if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
                        dbg("not a block or class device");
                        goto exit;
                }
 
-               subsystem = get_subsystem(main_argv[1]);
                if (!subsystem) {
-                       dbg("no subsystem?");
+                       dbg("no subsystem");
                        goto exit;
                }
 
+               udev_set_values(&udev, devpath, subsystem);
+
                /* skip blacklisted subsystems */
-               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++;
-               }
+               if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
+                       dbg("don't care about '%s' devices", subsystem);
+                       goto exit;
+               };
+
        }
 
        /* set signal handlers */
-       act.sa_handler = sig_handler;
+       act.sa_handler = (void (*) (int))sig_handler;
        sigemptyset (&act.sa_mask);
-       act.sa_flags = SA_RESTART;
+       /* alarm must not restart syscalls*/
+       sigaction(SIGALRM, &act, NULL);
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
+       /* trigger timout to interrupt blocking syscalls */
+       alarm(ALARM_TIMEOUT);
+
        /* initialize udev database */
-       if (udevdb_init(UDEVDB_DEFAULT) != 0) {
-               dbg("unable to initialize database");
-               goto exit;
-       }
+       if (udevdb_init(UDEVDB_DEFAULT) != 0)
+               info("error: unable to initialize database, continuing without database");
 
        switch(act_type) {
        case UDEVSTART:
                dbg("udevstart");
                namedev_init();
-               udev_sleep = 0;
                retval = udev_start();
                break;
        case ADD:
                dbg("udev add");
+
+               /* open the device */
+               snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+               class_dev = sysfs_open_class_device_path(path);
+               if (class_dev == NULL) {
+                       dbg ("sysfs_open_class_device_path failed");
+                       break;
+               }
+               dbg("opened class_dev->name='%s'", class_dev->name);
+
+               /* init rules */
                namedev_init();
-               retval = udev_add_device(devpath, subsystem, NOFAKE);
+
+               /* name, create node, store in db */
+               retval = udev_add_device(&udev, class_dev);
+
+               /* run scripts */
+               dev_d_execute(&udev);
+
+               sysfs_close_class_device(class_dev);
                break;
        case REMOVE:
                dbg("udev remove");
-               retval = udev_remove_device(devpath, subsystem);
+
+               /* get node from db, delete it*/
+               retval = udev_remove_device(&udev);
+
+               /* run scripts */
+               dev_d_execute(&udev);
        }
 
        udevdb_exit();
 
 exit:
+       logging_close();
        return retval;
 }