chiark / gitweb /
udevtest: add udev_rules_apply_format() to RUN keys
[elogind.git] / udev_add.c
index 42b8d2104c0e6a83c3e47ac1f575004dbdb131de..6de285831359bf7bac46d69e9b8cc4acc64ec55d 100644 (file)
@@ -1,10 +1,8 @@
 /*
  * udev-add.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 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
@@ -24,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <grp.h>
 #include <net/if.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_sysfs.h"
-#include "udev_version.h"
-#include "logging.h"
-#include "namedev.h"
-#include "udev_db.h"
+#include "udev_rules.h"
 #include "udev_selinux.h"
 
 
@@ -52,40 +43,32 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
        struct stat stats;
        int retval = 0;
 
+       if (major(devt) != 0 && strcmp(udev->dev->subsystem, "block") == 0)
+               mode |= S_IFBLK;
+       else
+               mode |= S_IFCHR;
+
        if (stat(file, &stats) != 0)
                goto create;
 
-       /* preserve node with already correct numbers, to not change the inode number */
-       if (((stats.st_mode & S_IFMT) == S_IFBLK || (stats.st_mode & S_IFMT) == S_IFCHR) &&
-           (stats.st_rdev == devt)) {
-               dbg("preserve file '%s', cause it has correct dev_t", file);
-               selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
+       /* preserve node with already correct numbers, to prevent changing the inode number */
+       if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) {
+               info("preserve file '%s', cause it has correct dev_t", file);
+               selinux_setfilecon(file, udev->dev->kernel_name, stats.st_mode);
                goto perms;
        }
 
        if (unlink(file) != 0)
-               dbg("unlink(%s) failed with error '%s'", file, strerror(errno));
+               err("unlink(%s) failed: %s", file, strerror(errno));
        else
                dbg("already present file '%s' unlinked", file);
 
 create:
-       switch (udev->type) {
-       case BLOCK:
-               mode |= S_IFBLK;
-               break;
-       case CLASS:
-               mode |= S_IFCHR;
-               break;
-       default:
-               dbg("unknown node type %c\n", udev->type);
-               return -EINVAL;
-       }
-
-       selinux_setfscreatecon(file, udev->kernel_name, mode);
+       selinux_setfscreatecon(file, udev->dev->kernel_name, mode);
        retval = mknod(file, mode, devt);
        selinux_resetfscreatecon();
        if (retval != 0) {
-               dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+               err("mknod(%s, %#o, %u, %u) failed: %s",
                    file, mode, major(devt), minor(devt), strerror(errno));
                goto exit;
        }
@@ -93,14 +76,14 @@ create:
 perms:
        dbg("chmod(%s, %#o)", file, mode);
        if (chmod(file, mode) != 0) {
-               dbg("chmod(%s, %#o) failed with error '%s'", file, mode, strerror(errno));
+               err("chmod(%s, %#o) failed: %s", file, mode, strerror(errno));
                goto exit;
        }
 
        if (uid != 0 || gid != 0) {
                dbg("chown(%s, %u, %u)", file, uid, gid);
                if (chown(file, uid, gid) != 0) {
-                       dbg("chown(%s, %u, %u) failed with error '%s'",
+                       err("chown(%s, %u, %u) failed: %s",
                            file, uid, gid, strerror(errno));
                        goto exit;
                }
@@ -110,10 +93,9 @@ exit:
        return retval;
 }
 
-static int create_node(struct udevice *udev, struct sysfs_class_device *class_dev)
+static int create_node(struct udevice *udev)
 {
        char filename[PATH_SIZE];
-       char partitionname[PATH_SIZE];
        struct name_entry *name_loop;
        uid_t uid;
        gid_t gid;
@@ -150,28 +132,28 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
                if (endptr[0] == '\0')
                        gid = (gid_t) id;
                else
-                       gid = lookup_user(udev->group);
+                       gid = lookup_group(udev->group);
        }
 
-       if (!udev->test_run) {
-               info("creating device node '%s'", filename);
+       info("creating device node '%s', major = '%d', minor = '%d', " "mode = '%#o', uid = '%d', gid = '%d'",
+            filename, major(udev->devt), minor(udev->devt), udev->mode, uid, gid);
+
+       if (!udev->test_run)
                if (udev_make_node(udev, filename, udev->devt, udev->mode, uid, gid) != 0)
                        goto error;
-       } else {
-               info("creating device node '%s', major = '%d', minor = '%d', "
-                    "mode = '%#o', uid = '%d', gid = '%d'", filename,
-                    major(udev->devt), minor(udev->devt), udev->mode, uid, gid);
-       }
+
+       setenv("DEVNAME", filename, 1);
 
        /* create all_partitions if requested */
        if (udev->partitions) {
-               struct sysfs_attribute *attr;
+               char partitionname[PATH_SIZE];
+               char *attr;
                int range;
 
                /* take the maximum registered minor range */
-               attr = sysfs_get_classdev_attr(class_dev, "range");
+               attr = sysfs_attr_get_value(udev->dev->devpath, "range");
                if (attr) {
-                       range = atoi(attr->value);
+                       range = atoi(attr);
                        if (range > 1)
                                udev->partitions = range-1;
                }
@@ -182,52 +164,62 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
                                snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
                                partitionname[sizeof(partitionname)-1] = '\0';
-                               part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
+                               part_devt = makedev(major(udev->devt), minor(udev->devt) + i);
                                udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
                        }
                }
        }
 
        /* create symlink(s) if requested */
-       list_for_each_entry(name_loop, &udev->symlink_list, node) {
-               int retval;
-               char linktarget[PATH_SIZE];
-
-               snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
-               filename[sizeof(filename)-1] = '\0';
-
-               dbg("symlink '%s' to node '%s' requested", filename, udev->name);
-               if (!udev->test_run)
-                       if (strchr(filename, '/'))
-                               create_path(filename);
-
-               /* optimize relative link */
-               linktarget[0] = '\0';
-               i = 0;
-               tail = 0;
-               while (udev->name[i] && (udev->name[i] == name_loop->name[i])) {
-                       if (udev->name[i] == '/')
-                               tail = i+1;
-                       i++;
-               }
-               while (name_loop->name[i] != '\0') {
-                       if (name_loop->name[i] == '/')
-                               strlcat(linktarget, "../", sizeof(linktarget));
-                       i++;
-               }
+       if (!list_empty(&udev->symlink_list)) {
+               char symlinks[512] = "";
+
+               list_for_each_entry(name_loop, &udev->symlink_list, node) {
+                       int retval;
+                       char linktarget[PATH_SIZE];
+
+                       snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
+                       filename[sizeof(filename)-1] = '\0';
+
+                       dbg("symlink '%s' to node '%s' requested", filename, udev->name);
+                       if (!udev->test_run)
+                               if (strchr(filename, '/'))
+                                       create_path(filename);
+
+                       /* optimize relative link */
+                       linktarget[0] = '\0';
+                       i = 0;
+                       tail = 0;
+                       while (udev->name[i] && (udev->name[i] == name_loop->name[i])) {
+                               if (udev->name[i] == '/')
+                                       tail = i+1;
+                               i++;
+                       }
+                       while (name_loop->name[i] != '\0') {
+                               if (name_loop->name[i] == '/')
+                                       strlcat(linktarget, "../", sizeof(linktarget));
+                               i++;
+                       }
 
-               strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
+                       strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
+
+                       info("creating symlink '%s' to '%s'", filename, linktarget);
+                       if (!udev->test_run) {
+                               unlink(filename);
+                               selinux_setfscreatecon(filename, NULL, S_IFLNK);
+                               retval = symlink(linktarget, filename);
+                               selinux_resetfscreatecon();
+                               if (retval != 0)
+                                       err("symlink(%s, %s) failed: %s",
+                                           linktarget, filename, strerror(errno));
+                       }
 
-               dbg("symlink(%s, %s)", linktarget, filename);
-               if (!udev->test_run) {
-                       unlink(filename);
-                       selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
-                       retval = symlink(linktarget, filename);
-                       selinux_resetfscreatecon();
-                       if (retval != 0)
-                               dbg("symlink(%s, %s) failed with error '%s'",
-                                   linktarget, filename, strerror(errno));
+                       strlcat(symlinks, filename, sizeof(symlinks));
+                       strlcat(symlinks, " ", sizeof(symlinks));
                }
+
+               remove_trailing_chars(symlinks, ' ');
+               setenv("DEVLINKS", symlinks, 1);
        }
 
        return 0;
@@ -241,87 +233,67 @@ static int rename_net_if(struct udevice *udev)
        struct ifreq ifr;
        int retval;
 
-       dbg("changing net interface name from '%s' to '%s'", udev->kernel_name, udev->name);
+       info("changing net interface name from '%s' to '%s'", udev->dev->kernel_name, udev->name);
        if (udev->test_run)
                return 0;
 
        sk = socket(PF_INET, SOCK_DGRAM, 0);
        if (sk < 0) {
-               dbg("error opening socket");
+               err("error opening socket: %s", strerror(errno));
                return -1;
        }
 
        memset(&ifr, 0x00, sizeof(struct ifreq));
-       strlcpy(ifr.ifr_name, udev->kernel_name, IFNAMSIZ);
+       strlcpy(ifr.ifr_name, udev->dev->kernel_name, IFNAMSIZ);
        strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
 
        retval = ioctl(sk, SIOCSIFNAME, &ifr);
        if (retval != 0)
-               dbg("error changing net interface name");
+               err("error changing net interface name: %s", strerror(errno));
        close(sk);
 
        return retval;
 }
 
-int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
+int udev_add_device(struct udevice *udev)
 {
        char *pos;
        int retval = 0;
 
-       if (udev->type == BLOCK || udev->type == CLASS) {
-               udev->devt = get_devt(class_dev);
-               if (!udev->devt) {
-                       dbg("no dev-file found, do nothing");
-                       return 0;
-               }
-       }
-
-       if (namedev_name_device(udev, class_dev) != 0)
-               return 0;
-
        dbg("adding name='%s'", udev->name);
-
        selinux_init();
 
-       if (udev->type == BLOCK || udev->type == CLASS) {
-               retval = create_node(udev, class_dev);
+       if (major(udev->devt)) {
+               retval = create_node(udev);
                if (retval != 0)
                        goto exit;
 
                if (udev_db_add_device(udev) != 0)
-                       dbg("udev_db_add_dev failed, but we create the node anyway, "
-                           "remove might not work for custom names");
-
-               /* use full path to the environment */
-               snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
-               udev->devname[sizeof(udev->devname)-1] = '\0';
-
-       } else if (udev->type == NET) {
+                       dbg("udev_db_add_dev failed, remove might not work for custom names");
+       } else if (strcmp(udev->dev->subsystem, "net") == 0) {
                /* look if we want to change the name of the netif */
-               if (strcmp(udev->name, udev->kernel_name) != 0) {
+               if (strcmp(udev->name, udev->dev->kernel_name) != 0) {
                        retval = rename_net_if(udev);
                        if (retval != 0)
                                goto exit;
 
+                       info("renamed netif to '%s'", udev->name);
                        /* we've changed the name, now fake the devpath, cause the
                         * original kernel name sleeps with the fishes and we don't
                         * get an event from the kernel with the new name
                         */
-                       pos = strrchr(udev->devpath, '/');
+                       pos = strrchr(udev->dev->devpath, '/');
                        if (pos != NULL) {
                                pos[1] = '\0';
-                               strlcat(udev->devpath, udev->name, sizeof(udev->devpath));
-                               setenv("DEVPATH", udev->devpath, 1);
+                               strlcat(udev->dev->devpath, udev->name, sizeof(udev->dev->devpath));
+                               strlcpy(udev->dev->kernel_name, udev->name, sizeof(udev->dev->kernel_name));
+                               setenv("DEVPATH", udev->dev->devpath, 1);
                                setenv("INTERFACE", udev->name, 1);
                        }
-
-                       /* use netif name for the environment */
-                       strlcpy(udev->devname, udev->name, sizeof(udev->devname));
                }
        }
 
 exit:
        selinux_exit();
-
        return retval;
 }