chiark / gitweb /
[PATCH] switch major/minor to dev_t
[elogind.git] / udev_add.c
index 78c78a1..66264f0 100644 (file)
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
-#ifndef __KLIBC__
 #include <pwd.h>
-#include <utmp.h>
-#endif
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
+#include "udev_sysfs.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
-#include "klibc_fixups.h"
+#include "udev_db.h"
+#include "udev_selinux.h"
 
-#define LOCAL_USER "$local"
 
-#include "selinux.h"
-
-/* 
- * Right now the major/minor of a device is stored in a file called
- * "dev" in sysfs.
- * The number is stored as:
- *     MM:mm
- *             MM is the major
- *             mm is the minor
- *             The value is in decimal.
- */
-static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
-{
-       struct sysfs_attribute *attr = NULL;
-
-       attr = sysfs_get_classdev_attr(class_dev, "dev");
-       if (attr == NULL)
-               goto error;
-       dbg("dev='%s'", attr->value);
-
-       if (sscanf(attr->value, "%u:%u", &udev->major, &udev->minor) != 2)
-               goto error;
-       dbg("found major=%d, minor=%d", udev->major, udev->minor);
-
-       return 0;
-error:
-       return -1;
-}
-
-static int create_path(char *file)
-{
-       char p[NAME_SIZE];
-       char *pos;
-       int retval;
-       struct stat stats;
-       
-       strfieldcpy(p, file);
-       pos = strchr(p+1, '/');
-       while (1) {
-               pos = strchr(pos+1, '/');
-               if (pos == NULL)
-                       break;
-               *pos = 0x00;
-               if (stat(p, &stats)) {
-                       selinux_setfscreatecon(p, S_IFDIR);
-                       retval = mkdir(p, 0755);
-                       if (retval != 0) {
-                               dbg("mkdir(%s) failed with error '%s'",
-                                   p, strerror(errno));
-                               return retval;
-                       }
-                       dbg("created '%s'", p);
-               } else {
-                       selinux_setfilecon(p, S_IFDIR);
-               }
-               *pos = '/';
-       }
-       return 0;
-}
-
-static int make_node(char *file, int major, int minor, unsigned int mode, uid_t uid, gid_t gid)
+int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid)
 {
        struct stat stats;
        int retval = 0;
@@ -120,9 +57,9 @@ static int make_node(char *file, int major, int minor, unsigned int mode, uid_t
 
        /* 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 == makedev(major, minor))) {
+           (stats.st_rdev == devt)) {
                dbg("preserve file '%s', cause it has correct dev_t", file);
-               selinux_setfilecon(file,stats.st_mode);
+               selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
                goto perms;
        }
 
@@ -132,11 +69,27 @@ static int make_node(char *file, int major, int minor, unsigned int mode, uid_t
                dbg("already present file '%s' unlinked", file);
 
 create:
-       selinux_setfscreatecon(file, mode);
-       retval = mknod(file, mode, makedev(major, minor));
+       switch (udev->type) {
+       case 'b':
+               mode |= S_IFBLK;
+               break;
+       case 'c':
+       case 'u':
+               mode |= S_IFCHR;
+               break;
+       case 'p':
+               mode |= S_IFIFO;
+               break;
+       default:
+               dbg("unknown node type %c\n", udev->type);
+               return -EINVAL;
+       }
+
+       selinux_setfscreatecon(file, udev->kernel_name, mode);
+       retval = mknod(file, mode, devt);
        if (retval != 0) {
                dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
-                   file, mode, major, minor, strerror(errno));
+                   file, mode, major(devt), minor(devt), strerror(errno));
                goto exit;
        }
 
@@ -160,135 +113,102 @@ exit:
        return retval;
 }
 
-/* get the local logged in user */
-static void set_to_local_user(char *user)
-{
-       struct utmp *u;
-       time_t recent = 0;
-
-       strfieldcpymax(user, default_owner_str, OWNER_SIZE);
-       setutent();
-       while (1) {
-               u = getutent();
-               if (u == NULL)
-                       break;
-
-               /* is this a user login ? */
-               if (u->ut_type != USER_PROCESS)
-                       continue;
-
-               /* is this a local login ? */
-               if (strcmp(u->ut_host, ""))
-                       continue;
-
-               if (u->ut_time > recent) {
-                       recent = u->ut_time;
-                       strfieldcpymax(user, u->ut_user, OWNER_SIZE);
-                       dbg("local user is '%s'", user);
-                       break;
-               }
-       }
-       endutent();
-}
-
-static int create_node(struct udevice *dev, int fake)
+static int create_node(struct udevice *udev, struct sysfs_class_device *class_dev)
 {
        char filename[NAME_SIZE];
-       char linkname[NAME_SIZE];
-       char linktarget[NAME_SIZE];
        char partitionname[NAME_SIZE];
        uid_t uid = 0;
        gid_t gid = 0;
-       int i;
        int tail;
        char *pos;
        int len;
+               int i;
 
-       strfieldcpy(filename, udev_root);
-       strfieldcat(filename, dev->name);
-
-       switch (dev->type) {
-       case 'b':
-               dev->mode |= S_IFBLK;
-               break;
-       case 'c':
-       case 'u':
-               dev->mode |= S_IFCHR;
-               break;
-       case 'p':
-               dev->mode |= S_IFIFO;
-               break;
-       default:
-               dbg("unknown node type %c\n", dev->type);
-               return -EINVAL;
-       }
+       snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
+       filename[NAME_SIZE-1] = '\0';
 
        /* create parent directories if needed */
-       if (strrchr(dev->name, '/'))
+       if (strchr(udev->name, '/'))
                create_path(filename);
 
-       if (dev->owner[0] != '\0') {
+       if (udev->owner[0] != '\0') {
                char *endptr;
-               unsigned long id = strtoul(dev->owner, &endptr, 10);
+               unsigned long id = strtoul(udev->owner, &endptr, 10);
+
                if (endptr[0] == '\0')
                        uid = (uid_t) id;
                else {
                        struct passwd *pw;
-                       if (strncmp(dev->owner, LOCAL_USER, sizeof(LOCAL_USER)) == 0)
-                               set_to_local_user(dev->owner);
 
-                       pw = getpwnam(dev->owner);
+                       pw = getpwnam(udev->owner);
                        if (pw == NULL)
-                               dbg("specified user unknown '%s'", dev->owner);
+                               dbg("specified user unknown '%s'", udev->owner);
                        else
                                uid = pw->pw_uid;
                }
        }
 
-       if (dev->group[0] != '\0') {
+       if (udev->group[0] != '\0') {
                char *endptr;
-               unsigned long id = strtoul(dev->group, &endptr, 10);
+               unsigned long id = strtoul(udev->group, &endptr, 10);
+
                if (endptr[0] == '\0')
                        gid = (gid_t) id;
                else {
-                       struct group *gr = getgrnam(dev->group);
+                       struct group *gr = getgrnam(udev->group);
                        if (gr == NULL)
-                               dbg("specified group unknown '%s'", dev->group);
+                               dbg("specified group unknown '%s'", udev->group);
                        else
                                gid = gr->gr_gid;
                }
        }
 
-       if (!fake) {
+       if (!udev->test_run) {
                info("creating device node '%s'", filename);
-               if (make_node(filename, dev->major, dev->minor, dev->mode, uid, gid) != 0)
+               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,
-                    dev->major, dev->minor, (mode_t)dev->mode, uid, gid);
+                    major(udev->devt), minor(udev->devt), udev->mode, uid, gid);
        }
 
        /* create all_partitions if requested */
-       if (dev->partitions > 0) {
-               info("creating device partition nodes '%s[1-%i]'", filename, dev->partitions);
-               if (!fake) {
-                       for (i = 1; i <= dev->partitions; i++) {
+       if (udev->partitions) {
+               struct sysfs_attribute *attr;
+               int range;
+
+               /* take the maximum registered minor range */
+               attr = sysfs_get_classdev_attr(class_dev, "range");
+               if (attr) {
+                       range = atoi(attr->value);
+                       if (range > 1)
+                               udev->partitions = range-1;
+               }
+               info("creating device partition nodes '%s[1-%i]'", filename, udev->partitions);
+               if (!udev->test_run) {
+                       for (i = 1; i <= udev->partitions; i++) {
+                               dev_t part_devt;
+
                                strfieldcpy(partitionname, filename);
                                strintcat(partitionname, i);
-                               make_node(partitionname, dev->major,
-                                         dev->minor + i, dev->mode, uid, gid);
+                               part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
+                               udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
                        }
                }
        }
 
        /* create symlink(s) if requested */
-       foreach_strpart(dev->symlink, " ", pos, len) {
+       foreach_strpart(udev->symlink, " ", pos, len) {
+               char linkname[NAME_SIZE];
+               char linktarget[NAME_SIZE];
+
                strfieldcpymax(linkname, pos, len+1);
-               strfieldcpy(filename, udev_root);
-               strfieldcat(filename, linkname);
-               dbg("symlink '%s' to node '%s' requested", filename, dev->name);
-               if (!fake)
+               snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
+               filename[NAME_SIZE-1] = '\0';
+
+               dbg("symlink '%s' to node '%s' requested", filename, udev->name);
+               if (!udev->test_run)
                        if (strrchr(linkname, '/'))
                                create_path(filename);
 
@@ -296,8 +216,8 @@ static int create_node(struct udevice *dev, int fake)
                linktarget[0] = '\0';
                i = 0;
                tail = 0;
-               while ((dev->name[i] == linkname[i]) && dev->name[i]) {
-                       if (dev->name[i] == '/')
+               while ((udev->name[i] == linkname[i]) && udev->name[i]) {
+                       if (udev->name[i] == '/')
                                tail = i+1;
                        i++;
                }
@@ -307,11 +227,11 @@ static int create_node(struct udevice *dev, int fake)
                        i++;
                }
 
-               strfieldcat(linktarget, &dev->name[tail]);
+               strfieldcat(linktarget, &udev->name[tail]);
 
                dbg("symlink(%s, %s)", linktarget, filename);
-               if (!fake) {
-                       selinux_setfscreatecon(filename, S_IFLNK);
+               if (!udev->test_run) {
+                       selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
                        unlink(filename);
                        if (symlink(linktarget, filename) != 0)
                                dbg("symlink(%s, %s) failed with error '%s'",
@@ -324,64 +244,14 @@ error:
        return -1;
 }
 
-static struct sysfs_class_device *get_class_dev(const char *device_name)
-{
-       char dev_path[SYSFS_PATH_MAX];
-       struct sysfs_class_device *class_dev = NULL;
-
-       strfieldcpy(dev_path, sysfs_path);
-       strfieldcat(dev_path, device_name);
-       dbg("looking at '%s'", dev_path);
-
-       /* open up the sysfs class device for this thing... */
-       class_dev = sysfs_open_class_device_path(dev_path);
-       if (class_dev == NULL) {
-               dbg ("sysfs_open_class_device_path failed");
-               goto exit;
-       }
-       dbg("class_dev->name='%s'", class_dev->name);
-
-exit:
-       return class_dev;
-}
-
-/* wait for the "dev" file to show up in the directory in sysfs.
- * If it doesn't happen in about 10 seconds, give up.
- */
-static int sleep_for_file(const char *path, char* file)
-{
-       char filename[SYSFS_PATH_MAX + 6];
-       int loop = WAIT_FOR_FILE_SECONDS * WAIT_FOR_FILE_RETRY_FREQ;
-       int retval;
-
-       strfieldcpy(filename, sysfs_path);
-       strfieldcat(filename, path);
-       strfieldcat(filename, file);
-
-       while (loop--) {
-               struct stat buf;
-
-               dbg("looking for '%s'", filename);
-               retval = stat(filename, &buf);
-               if (retval == 0)
-                       goto exit;
-
-               /* sleep to give the kernel a chance to create the dev file */
-               usleep(1000 * 1000 / WAIT_FOR_FILE_RETRY_FREQ);
-       }
-       retval = -ENODEV;
-exit:
-       return retval;
-}
-
-static int rename_net_if(struct udevice *dev, int fake)
+static int rename_net_if(struct udevice *udev)
 {
        int sk;
        struct ifreq ifr;
        int retval;
 
-       dbg("changing net interface name from '%s' to '%s'", dev->kernel_name, dev->name);
-       if (fake)
+       dbg("changing net interface name from '%s' to '%s'", udev->kernel_name, udev->name);
+       if (udev->test_run)
                return 0;
 
        sk = socket(PF_INET, SOCK_DGRAM, 0);
@@ -391,8 +261,8 @@ static int rename_net_if(struct udevice *dev, int fake)
        }
 
        memset(&ifr, 0x00, sizeof(struct ifreq));
-       strfieldcpy(ifr.ifr_name, dev->kernel_name);
-       strfieldcpy(ifr.ifr_newname, dev->name);
+       strfieldcpy(ifr.ifr_name, udev->kernel_name);
+       strfieldcpy(ifr.ifr_newname, udev->name);
 
        retval = ioctl(sk, SIOCSIFNAME, &ifr);
        if (retval != 0)
@@ -402,89 +272,65 @@ static int rename_net_if(struct udevice *dev, int fake)
        return retval;
 }
 
-int udev_add_device(const char *path, const char *subsystem, int fake)
+int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 {
-       struct sysfs_class_device *class_dev;
-       struct udevice dev;
-       char devpath[DEVPATH_SIZE];
        char *pos;
-       int retval;
-
-       memset(&dev, 0x00, sizeof(dev));
-
-       dev.type = get_device_type(path, subsystem);
-       switch (dev.type) {
-       case 'b':
-       case 'c':
-               retval = sleep_for_file(path, "/dev");
-               break;
-
-       case 'n':
-               retval = sleep_for_file(path, "/address");
-               break;
-
-       default:
-               dbg("unknown device type '%c'", dev.type);
-               return -1;
-       }
-
-       class_dev = get_class_dev(path);
-       if (class_dev == NULL)
-               return -1;
+       int retval = 0;
 
-       if (dev.type == 'b' || dev.type == 'c') {
-               retval = get_major_minor(class_dev, &dev);
-               if (retval != 0) {
-                       dbg("get_major_minor failed");
-                       goto exit;
+       if (udev->type == 'b' || udev->type == 'c') {
+               udev->devt = get_devt(class_dev);
+               if (!udev->devt) {
+                       dbg("no dev-file found, do nothing");
+                       return 0;
                }
        }
 
-       if (namedev_name_device(class_dev, &dev) != 0)
-               goto exit;
+       if (namedev_name_device(udev, class_dev) != 0)
+               return 0;
 
-       dbg("name='%s'", dev.name);
+       dbg("adding name='%s'", udev->name);
 
        selinux_init();
-       switch (dev.type) {
-       case 'b':
-       case 'c':
-               retval = create_node(&dev, fake);
+
+       if (udev->type == 'b' || udev->type == 'c') {
+               retval = create_node(udev, class_dev);
                if (retval != 0)
                        goto exit;
-               if ((!fake) && (udevdb_add_dev(path, &dev) != 0))
-                       dbg("udevdb_add_dev failed, but we are going to try "
-                           "to create the node anyway. But remove might not "
-                           "work properly for this device.");
 
-               dev_d_send(&dev, subsystem, path);
-               break;
+               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, NAME_SIZE, "%s/%s", udev_root, udev->name);
+               udev->devname[NAME_SIZE-1] = '\0';
 
-       case 'n':
-               strfieldcpy(devpath, path);
-               if (strcmp(dev.name, dev.kernel_name) != 0) {
-                       retval = rename_net_if(&dev, fake);
+       } else if (udev->type == 'n') {
+               /* look if we want to change the name of the netif */
+               if (strcmp(udev->name, udev->kernel_name) != 0) {
+                       retval = rename_net_if(udev);
                        if (retval != 0)
                                goto exit;
-                       /* netif's are keyed with the configured name, cause
-                        * the original kernel name sleeps with the fishes
+
+                       /* 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(devpath, '/');
+                       pos = strrchr(udev->devpath, '/');
                        if (pos != NULL) {
                                pos[1] = '\0';
-                               strfieldcat(devpath, dev.name);
+                               strfieldcat(udev->devpath, udev->name);
+                               setenv("DEVPATH", udev->devpath, 1);
+                               setenv("INTERFACE", udev->name, 1);
                        }
-               }
-               if ((!fake) && (udevdb_add_dev(devpath, &dev) != 0))
-                       dbg("udevdb_add_dev failed");
 
-               dev_d_send(&dev, subsystem, devpath);
-               break;
+                       /* use netif name for the environment */
+                       strfieldcpy(udev->devname, udev->name);
+               }
        }
 
 exit:
        selinux_restore();
-       sysfs_close_class_device(class_dev);
 
        return retval;
 }