[PATCH] Add initial SELinux support for udev

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index 3b3ebd5bbbcce4e397cc5fe1c9a8f7d016ac5daa..2f64b4375ab8019409f289f48b4cb2cd22f14171 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -34,13 +34,14 @@
 #include <pwd.h>
 #endif
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
+#include "udev_selinux.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
 /* 
@@ -78,7 +79,7 @@ static int create_path(char *file)
        int retval;
        struct stat stats;
        
-       strncpy(p, file, sizeof(p));
+       strfieldcpy(p, file);
        pos = strchr(p+1, '/');
        while (1) {
                pos = strchr(pos+1, '/');
@@ -145,8 +146,8 @@ static int create_node(struct udevice *dev, int fake)
        int i;
        int tail;
 
-       strncpy(filename, udev_root, sizeof(filename));
-       strncat(filename, dev->name, sizeof(filename));
+       strfieldcpy(filename, udev_root);
+       strfieldcat(filename, dev->name);
 
        switch (dev->type) {
        case 'b':
@@ -196,20 +197,30 @@ static int create_node(struct udevice *dev, int fake)
                }
        }
 
-       if (!fake)
+       if (!fake) {
                info("creating device node '%s'", filename);
                make_node(filename, dev->major, dev->minor, dev->mode, uid, gid);
+       } 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);
+       }
 
        /* create partitions if requested */
        if (dev->partitions > 0) {
                info("creating device partition nodes '%s[1-%i]'", filename, dev->partitions);
-               for (i = 1; i <= dev->partitions; i++) {
-                       sprintf(partitionname, "%s%i", filename, i);
-                       make_node(partitionname, dev->major, dev->minor + i,
-                                   dev->mode, uid, gid);
+               if (!fake) {
+                       for (i = 1; i <= dev->partitions; i++) {
+                               sprintf(partitionname, "%s%i", filename, i);
+                               make_node(partitionname, dev->major,
+                                         dev->minor + i, dev->mode, uid, gid);
+                       }
                }
        }
 
+       if (!fake)
+               selinux_add_node(filename);
+
        /* create symlink if requested */
        if (dev->symlink[0] != '\0') {
                symlinks = dev->symlink;
@@ -218,8 +229,8 @@ static int create_node(struct udevice *dev, int fake)
                        if (linkname == NULL || linkname[0] == '\0')
                                break;
 
-                       strncpy(filename, udev_root, sizeof(filename));
-                       strncat(filename, linkname, sizeof(filename));
+                       strfieldcpy(filename, udev_root);
+                       strfieldcat(filename, linkname);
                        dbg("symlink '%s' to node '%s' requested", filename, dev->name);
                        if (!fake)
                                if (strrchr(linkname, '/'))
@@ -236,13 +247,13 @@ static int create_node(struct udevice *dev, int fake)
                        }
                        while (linkname[i] != '\0') {
                                if (linkname[i] == '/')
-                                       strcat(linktarget, "../");
+                                       strfieldcat(linktarget, "../");
                                i++;
                        }
 
                        if (linktarget[0] == '\0')
-                               strcpy(linktarget, "./");
-                       strcat(linktarget, &dev->name[tail]);
+                               strfieldcpy(linktarget, "./");
+                       strfieldcat(linktarget, &dev->name[tail]);
 
                        /* unlink existing files to ensure that our symlink is created */
                        if (!fake && (lstat(filename, &stats) == 0)) {
@@ -271,8 +282,8 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
        char dev_path[SYSFS_PATH_MAX];
        struct sysfs_class_device *class_dev = NULL;
 
-       strcpy(dev_path, sysfs_path);
-       strcat(dev_path, device_name);
+       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... */
@@ -297,9 +308,9 @@ static int sleep_for_dev(char *path)
        int loop = SECONDS_TO_WAIT_FOR_DEV;
        int retval;
 
-       strcpy(filename, sysfs_path);
-       strcat(filename, path);
-       strcat(filename, "/dev");
+       strfieldcpy(filename, sysfs_path);
+       strfieldcat(filename, path);
+       strfieldcat(filename, "/dev");
 
        while (loop--) {
                struct stat buf;