X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=ddcf85ee5c1dccfe71adcfb537055ea2133f6fcc;hp=83d3f9bbf8238d9dbd985c86975d007c8dbc5b22;hb=803ac7a6d8d06787305a01a068c2e0ca47e2536d;hpb=24f0605c1fec98b77eddb880a405289b08cb5670

diff --git a/udev_db.c b/udev_db.c
index 83d3f9bbf..ddcf85ee5 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -31,13 +31,14 @@
 #include <sys/types.h>
 
 #include "udev.h"
+#include "udev_selinux.h"
 
 
 static size_t devpath_to_db_path(const char *devpath, char *filename, size_t len)
 {
 	size_t start;
 
-	/* add location of db files */
+	/* translate to location of db file */
 	strlcpy(filename, udev_root, len);
 	start = strlcat(filename, "/"DB_DIR"/", len);
 	strlcat(filename, devpath, len);
@@ -64,13 +65,13 @@ static int name_index(const char *devpath, const char *name, int add)
 	strlcat(filename, device, sizeof(filename));
 
 	if (add) {
-		info("creating index: '%s'", filename);
+		info("creating index: '%s'\n", filename);
 		create_path(filename);
 		fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
 		if (fd > 0)
 			close(fd);
 	} else {
-		info("removing index: '%s'", filename);
+		info("removing index: '%s'\n", filename);
 		unlink(filename);
 		delete_path(filename);
 	}
@@ -91,12 +92,12 @@ int udev_db_get_devices_by_name(const char *name, struct list_head *name_list)
 
 	dir = opendir(dirname);
 	if (dir == NULL) {
-		info("no index directory '%s': %s", dirname, strerror(errno));
+		info("no index directory '%s': %s\n", dirname, strerror(errno));
 		rc = -1;
 		goto out;
 	}
 
-	info("found index directory '%s'", dirname);
+	info("found index directory '%s'\n", dirname);
 	while (1) {
 		struct dirent *ent;
 		char device[PATH_SIZE];
@@ -117,6 +118,16 @@ out:
 	return rc;
 }
 
+int udev_db_rename(const char *devpath_old, const char *devpath)
+{
+	char filename[PATH_SIZE];
+	char filename_old[PATH_SIZE];
+
+	devpath_to_db_path(devpath_old, filename_old, sizeof(filename_old));
+	devpath_to_db_path(devpath, filename, sizeof(filename));
+	return rename(filename_old, filename);
+}
+
 int udev_db_add_device(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
@@ -134,9 +145,13 @@ int udev_db_add_device(struct udevice *udev)
 	 */
 	if (list_empty(&udev->symlink_list) && list_empty(&udev->env_list) &&
 	    !udev->partitions && !udev->ignore_remove) {
-		dbg("nothing interesting to store, create symlink");
-		if (symlink(udev->name, filename) != 0) {
-			err("unable to create db link '%s': %s", filename, strerror(errno));
+		int ret;
+		dbg("nothing interesting to store, create symlink\n");
+		selinux_setfscreatecon(filename, NULL, S_IFLNK);	
+		ret = symlink(udev->name, filename);
+		selinux_resetfscreatecon();
+		if (ret != 0) {
+			err("unable to create db link '%s': %s\n", filename, strerror(errno));
 			return -1;
 		}
 	} else {
@@ -145,10 +160,10 @@ int udev_db_add_device(struct udevice *udev)
 
 		f = fopen(filename, "w");
 		if (f == NULL) {
-			err("unable to create db file '%s': %s", filename, strerror(errno));
+			err("unable to create db file '%s': %s\n", filename, strerror(errno));
 			return -1;
 		}
-		dbg("storing data for device '%s' in '%s'", udev->dev->devpath, filename);
+		dbg("storing data for device '%s' in '%s'\n", udev->dev->devpath, filename);
 
 		fprintf(f, "N:%s\n", udev->name);
 		list_for_each_entry(name_loop, &udev->symlink_list, node) {
@@ -157,9 +172,9 @@ int udev_db_add_device(struct udevice *udev)
 			name_index(udev->dev->devpath, name_loop->name, 1);
 		}
 		fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
-		if (udev->link_priority)
+		if (udev->link_priority != 0)
 			fprintf(f, "L:%u\n", udev->link_priority);
-		if (udev->partitions)
+		if (udev->partitions != 0)
 			fprintf(f, "A:%u\n", udev->partitions);
 		if (udev->ignore_remove)
 			fprintf(f, "R:%u\n", udev->ignore_remove);
@@ -186,32 +201,32 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
 	size_t cur;
 	size_t count;
 
-	strlcpy(udev->dev->devpath, devpath, sizeof(udev->dev->devpath));
+	sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
 	devpath_to_db_path(devpath, filename, sizeof(filename));
 
 	if (lstat(filename, &stats) != 0) {
-		info("no db file to read %s: %s", filename, strerror(errno));
+		info("no db file to read %s: %s\n", filename, strerror(errno));
 		return -1;
 	}
 	if ((stats.st_mode & S_IFMT) == S_IFLNK) {
 		char target[NAME_SIZE];
 		int target_len;
 
-		info("found a symlink as db file");
+		info("found a symlink as db file\n");
 		target_len = readlink(filename, target, sizeof(target));
 		if (target_len > 0)
 			target[target_len] = '\0';
 		else {
-			info("error reading db link %s: %s", filename, strerror(errno));
+			info("error reading db link %s: %s\n", filename, strerror(errno));
 			return -1;
 		}
-		dbg("db link points to '%s'", target);
+		dbg("db link points to '%s'\n", target);
 		strlcpy(udev->name, target, sizeof(udev->name));
 		return 0;
 	}
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		info("error reading db file %s: %s", filename, strerror(errno));
+		info("error reading db file %s: %s\n", filename, strerror(errno));
 		return -1;
 	}
 
@@ -286,6 +301,9 @@ int udev_db_delete_device(struct udevice *udev)
 	char filename[PATH_SIZE];
 	struct name_entry *name_loop;
 
+	if (udev->test_run)
+		return 0;
+
 	devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename));
 	unlink(filename);
 
@@ -305,7 +323,7 @@ int udev_db_get_all_entries(struct list_head *name_list)
 	strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
 	dir = opendir(dbpath);
 	if (dir == NULL) {
-		info("no udev_db available '%s': %s", dbpath, strerror(errno));
+		info("no udev_db available '%s': %s\n", dbpath, strerror(errno));
 		return -1;
 	}
 
@@ -322,7 +340,7 @@ int udev_db_get_all_entries(struct list_head *name_list)
 		strlcpy(device, ent->d_name, sizeof(device));
 		path_decode(device);
 		name_list_add(name_list, device, 1);
-		dbg("added '%s'", device);
+		dbg("added '%s'\n", device);
 	}
 
 	closedir(dir);