[PATCH] fix bad typo that prevents the GROUP to be applied

[elogind.git] / udev_add.c

diff --git a/udev_add.c b/udev_add.c
index e05710ce81f820638d90b1a3caa01c9938b3f385..15c6bf9fbca0ea5f951431c6870f78b2aa213c66 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -42,7 +42,7 @@
 #include "udev_sysfs.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "udev_db.h"
 #include "udev_selinux.h"
 
@@ -70,10 +70,10 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
 
 create:
        switch (udev->type) {
-       case BLOCK:
+       case DEV_BLOCK:
                mode |= S_IFBLK;
                break;
-       case CLASS:
+       case DEV_CLASS:
                mode |= S_IFCHR;
                break;
        default:
@@ -83,6 +83,7 @@ create:
 
        selinux_setfscreatecon(file, udev->kernel_name, mode);
        retval = mknod(file, mode, devt);
+       selinux_resetfscreatecon();
        if (retval != 0) {
                dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
                    file, mode, major(devt), minor(devt), strerror(errno));
@@ -111,35 +112,41 @@ exit:
 
 static int create_node(struct udevice *udev, struct sysfs_class_device *class_dev)
 {
-       char filename[NAME_SIZE];
-       char partitionname[NAME_SIZE];
+       char filename[PATH_SIZE];
+       char partitionname[PATH_SIZE];
        struct name_entry *name_loop;
-       uid_t uid = 0;
-       gid_t gid = 0;
+       uid_t uid;
+       gid_t gid;
        int tail;
        int i;
 
-       snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
-       filename[NAME_SIZE-1] = '\0';
+       snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
+       filename[sizeof(filename)-1] = '\0';
 
        /* create parent directories if needed */
        if (strchr(udev->name, '/'))
                create_path(filename);
 
-       if (udev->owner[0] != '\0') {
+       if (strcmp(udev->owner, "root") == 0)
+               uid = 0;
+       else {
                char *endptr;
-               unsigned long id = strtoul(udev->owner, &endptr, 10);
+               unsigned long id;
 
+               id = strtoul(udev->owner, &endptr, 10);
                if (endptr[0] == '\0')
                        uid = (uid_t) id;
                else
                        uid = lookup_user(udev->owner);
        }
 
-       if (udev->group[0] != '\0') {
+       if (strcmp(udev->group, "root") == 0)
+               gid = 0;
+       else {
                char *endptr;
-               unsigned long id = strtoul(udev->group, &endptr, 10);
+               unsigned long id;
 
+               id = strtoul(udev->group, &endptr, 10);
                if (endptr[0] == '\0')
                        gid = (gid_t) id;
                else
@@ -173,8 +180,8 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
                        for (i = 1; i <= udev->partitions; i++) {
                                dev_t part_devt;
 
-                               snprintf(partitionname, NAME_SIZE, "%s%d", filename, i);
-                               partitionname[NAME_SIZE-1] = '\0';
+                               snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
+                               partitionname[sizeof(partitionname)-1] = '\0';
                                part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
                                udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
                        }
@@ -183,10 +190,11 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
        /* create symlink(s) if requested */
        list_for_each_entry(name_loop, &udev->symlink_list, node) {
-               char linktarget[NAME_SIZE];
+               int retval;
+               char linktarget[PATH_SIZE];
 
-               snprintf(filename, NAME_SIZE, "%s/%s", udev_root, name_loop->name);
-               filename[NAME_SIZE-1] = '\0';
+               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)
@@ -204,17 +212,19 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
                }
                while (name_loop->name[i] != '\0') {
                        if (name_loop->name[i] == '/')
-                               strfieldcat(linktarget, "../");
+                               strlcat(linktarget, "../", sizeof(linktarget));
                        i++;
                }
 
-               strfieldcat(linktarget, &udev->name[tail]);
+               strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
 
                dbg("symlink(%s, %s)", linktarget, filename);
                if (!udev->test_run) {
-                       selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
                        unlink(filename);
-                       if (symlink(linktarget, filename) != 0)
+                       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));
                }
@@ -242,8 +252,8 @@ static int rename_net_if(struct udevice *udev)
        }
 
        memset(&ifr, 0x00, sizeof(struct ifreq));
-       strfieldcpy(ifr.ifr_name, udev->kernel_name);
-       strfieldcpy(ifr.ifr_newname, udev->name);
+       strlcpy(ifr.ifr_name, udev->kernel_name, IFNAMSIZ);
+       strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
 
        retval = ioctl(sk, SIOCSIFNAME, &ifr);
        if (retval != 0)
@@ -258,7 +268,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
        char *pos;
        int retval = 0;
 
-       if (udev->type == BLOCK || udev->type == CLASS) {
+       if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
                udev->devt = get_devt(class_dev);
                if (!udev->devt) {
                        dbg("no dev-file found, do nothing");
@@ -266,14 +276,14 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                }
        }
 
-       if (namedev_name_device(udev, class_dev) != 0)
+       if (udev_rules_get_name(udev, class_dev) != 0)
                return 0;
 
        dbg("adding name='%s'", udev->name);
 
        selinux_init();
 
-       if (udev->type == BLOCK || udev->type == CLASS) {
+       if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
                retval = create_node(udev, class_dev);
                if (retval != 0)
                        goto exit;
@@ -283,10 +293,10 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                            "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';
+               snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
+               udev->devname[sizeof(udev->devname)-1] = '\0';
 
-       } else if (udev->type == NET) {
+       } else if (udev->type == DEV_NET) {
                /* look if we want to change the name of the netif */
                if (strcmp(udev->name, udev->kernel_name) != 0) {
                        retval = rename_net_if(udev);
@@ -300,18 +310,18 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                        pos = strrchr(udev->devpath, '/');
                        if (pos != NULL) {
                                pos[1] = '\0';
-                               strfieldcat(udev->devpath, udev->name);
+                               strlcat(udev->devpath, udev->name, sizeof(udev->devpath));
                                setenv("DEVPATH", udev->devpath, 1);
                                setenv("INTERFACE", udev->name, 1);
                        }
 
                        /* use netif name for the environment */
-                       strfieldcpy(udev->devname, udev->name);
+                       strlcpy(udev->devname, udev->name, sizeof(udev->devname));
                }
        }
 
 exit:
-       selinux_restore();
+       selinux_exit();
 
        return retval;
 }