X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_add.c;h=9420b4fe14fb633c46d2c4f2b790fcc7b412f03a;hp=aa19d874c3b31fd85760f42761287e7879ae6f58;hb=77914dfeda9caae155f7dcdbeb06dc8574a6f4ad;hpb=03fd7a3ad3438c7ae4525215ac58c3d94133cc35

diff --git a/udev_add.c b/udev_add.c
index aa19d874c..9420b4fe1 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -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
@@ -34,15 +32,15 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
-#include <pwd.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_rules.h"
 #include "udev_db.h"
 #include "udev_selinux.h"
 
@@ -52,13 +50,24 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
 	struct stat stats;
 	int retval = 0;
 
+	switch (udev->type) {
+	case DEV_BLOCK:
+		mode |= S_IFBLK;
+		break;
+	case DEV_CLASS:
+		mode |= S_IFCHR;
+		break;
+	default:
+		dbg("unknown node type %c\n", udev->type);
+		return -EINVAL;
+	}
+
 	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);
+	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->kernel_name, stats.st_mode);
 		goto perms;
 	}
@@ -69,22 +78,11 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
 		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);
 	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 with error '%s'",
 		    file, mode, major(devt), minor(devt), strerror(errno));
 		goto exit;
 	}
@@ -111,51 +109,45 @@ 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 {
-			struct passwd *pw;
-
-			pw = getpwnam(udev->owner);
-			if (pw == NULL)
-				dbg("specified user unknown '%s'", udev->owner);
-			else
-				uid = pw->pw_uid;
-		}
+		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 {
-			struct group *gr = getgrnam(udev->group);
-			if (gr == NULL)
-				dbg("specified group unknown '%s'", udev->group);
-			else
-				gid = gr->gr_gid;
-		}
+		else
+			gid = lookup_group(udev->group);
 	}
 
 	if (!udev->test_run) {
@@ -185,9 +177,9 @@ 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';
-				part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
+				snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
+				partitionname[sizeof(partitionname)-1] = '\0';
+				part_devt = makedev(major(udev->devt), minor(udev->devt) + i);
 				udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
 			}
 		}
@@ -195,10 +187,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)
@@ -216,17 +209,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);
+		info("creating symlink '%s' to '%s'", filename, linktarget);
 		if (!udev->test_run) {
-			selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
 			unlink(filename);
-			if (symlink(linktarget, filename) != 0)
+			selinux_setfscreatecon(filename, NULL, S_IFLNK);
+			retval = symlink(linktarget, filename);
+			selinux_resetfscreatecon();
+			if (retval != 0)
 				dbg("symlink(%s, %s) failed with error '%s'",
 				    linktarget, filename, strerror(errno));
 		}
@@ -243,7 +238,7 @@ 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->kernel_name, udev->name);
 	if (udev->test_run)
 		return 0;
 
@@ -254,8 +249,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)
@@ -270,22 +265,10 @@ 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) {
-		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) {
+	if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
 		retval = create_node(udev, class_dev);
 		if (retval != 0)
 			goto exit;
@@ -295,16 +278,17 @@ 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);
 			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
@@ -312,18 +296,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));
+				strlcpy(udev->kernel_name, udev->name, sizeof(udev->kernel_name));
 				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;
 }