X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=1feab7d63f961c995748af74cc45733f82e13cd7;hp=f9adf5c6317554b6bb53cc9d24989f879b28a21f;hb=4278ab015d76876f61821b293df07e0c3746bfd5;hpb=13d11705bf0117365afc3f9210f4d568a2baa69c

diff --git a/udev_db.c b/udev_db.c
index f9adf5c63..1feab7d63 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -1,6 +1,4 @@
 /*
- * udev_db.c
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
@@ -15,7 +13,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -29,91 +27,206 @@
 #include <string.h>
 #include <errno.h>
 #include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
-#include "udev_db.h"
+#include "udev_selinux.h"
 
-#define PATH_TO_NAME_CHAR		'@'
 
-static int get_db_filename(const char *devpath, char *filename, int len)
+static size_t devpath_to_db_path(const char *devpath, char *filename, size_t len)
 {
-	char temp[PATH_SIZE];
-	char *pos;
-
-	/* replace '/' to transform path into a filename */
-	strlcpy(temp, devpath, sizeof(temp));
-	pos = strchr(&temp[1], '/');
-	while (pos) {
-		pos[0] = PATH_TO_NAME_CHAR;
-		pos = strchr(&pos[1], '/');
-	}
-	snprintf(filename, len, "%s%s", udev_db_path, temp);
-	filename[len-1] = '\0';
+	size_t start;
+
+	/* translate to location of db file */
+	strlcpy(filename, udev_root, len);
+	start = strlcat(filename, "/"DB_DIR"/", len);
+	strlcat(filename, devpath, len);
+	return path_encode(&filename[start], len - start);
+}
 
+/* reverse mapping from the device file name to the devpath */
+static int name_index(const char *devpath, const char *name, int add)
+{
+	char device[PATH_SIZE];
+	char filename[PATH_SIZE * 2];
+	size_t start;
+	int fd;
+
+	/* directory with device name */
+	strlcpy(filename, udev_root, sizeof(filename));
+	start = strlcat(filename, "/"DB_NAME_INDEX_DIR"/", sizeof(filename));
+	strlcat(filename, name, sizeof(filename));
+	path_encode(&filename[start], sizeof(filename) - start);
+	/* entry with the devpath */
+	strlcpy(device, devpath, sizeof(device));
+	path_encode(device, sizeof(device));
+	strlcat(filename, "/", sizeof(filename));
+	strlcat(filename, device, sizeof(filename));
+
+	if (add) {
+		info("creating index: '%s'", 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);
+		unlink(filename);
+		delete_path(filename);
+	}
 	return 0;
 }
 
+int udev_db_get_devices_by_name(const char *name, struct list_head *name_list)
+{
+	char dirname[PATH_MAX];
+	size_t start;
+	DIR *dir;
+	int rc = 0;
+
+	strlcpy(dirname, udev_root, sizeof(dirname));
+	start = strlcat(dirname, "/"DB_NAME_INDEX_DIR"/", sizeof(dirname));
+	strlcat(dirname, name, sizeof(dirname));
+	path_encode(&dirname[start], sizeof(dirname) - start);
+
+	dir = opendir(dirname);
+	if (dir == NULL) {
+		info("no index directory '%s': %s", dirname, strerror(errno));
+		rc = -1;
+		goto out;
+	}
+
+	info("found index directory '%s'", dirname);
+	while (1) {
+		struct dirent *ent;
+		char device[PATH_SIZE];
+
+		ent = readdir(dir);
+		if (ent == NULL || ent->d_name[0] == '\0')
+			break;
+		if (ent->d_name[0] == '.')
+			continue;
+
+		strlcpy(device, ent->d_name, sizeof(device));
+		path_decode(device);
+		name_list_add(name_list, device, 0);
+		rc++;
+	}
+	closedir(dir);
+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];
-	struct name_entry *name_loop;
-	FILE *f;
 
 	if (udev->test_run)
 		return 0;
 
-	/* don't write anything if udev created only the node with the
-	 * kernel name without any interesting data to remember
+	devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename));
+	create_path(filename);
+	unlink(filename);
+
+	/*
+	 * don't waste tmpfs memory pages, if we don't have any data to store
+	 * create fake db-file; store the node-name in a symlink target
 	 */
-	if (strcmp(udev->name, udev->kernel_name) == 0 &&
-	    list_empty(&udev->symlink_list) && list_empty(&udev->env_list) &&
+	if (list_empty(&udev->symlink_list) && list_empty(&udev->env_list) &&
 	    !udev->partitions && !udev->ignore_remove) {
-		dbg("nothing interesting to store in udevdb, skip");
-		goto exit;
-	}
+		int ret;
+		dbg("nothing interesting to store, create symlink");
+		selinux_setfscreatecon(filename, NULL, S_IFLNK);	
+		ret = symlink(udev->name, filename);
+		selinux_resetfscreatecon();
+		if (ret != 0) {
+			err("unable to create db link '%s': %s", filename, strerror(errno));
+			return -1;
+		}
+	} else {
+		FILE *f;
+		struct name_entry *name_loop;
+
+		f = fopen(filename, "w");
+		if (f == NULL) {
+			err("unable to create db file '%s': %s", filename, strerror(errno));
+			return -1;
+		}
+		dbg("storing data for device '%s' in '%s'", udev->dev->devpath, filename);
 
-	get_db_filename(udev->devpath, filename, sizeof(filename));
-	create_path(filename);
-	f = fopen(filename, "w");
-	if (f == NULL) {
-		err("unable to create db file '%s'", filename);
-		return -1;
+		fprintf(f, "N:%s\n", udev->name);
+		list_for_each_entry(name_loop, &udev->symlink_list, node) {
+			fprintf(f, "S:%s\n", name_loop->name);
+			/* add symlink-name to index */
+			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 != 0)
+			fprintf(f, "L:%u\n", udev->link_priority);
+		if (udev->partitions != 0)
+			fprintf(f, "A:%u\n", udev->partitions);
+		if (udev->ignore_remove)
+			fprintf(f, "R:%u\n", udev->ignore_remove);
+		list_for_each_entry(name_loop, &udev->env_list, node)
+			fprintf(f, "E:%s\n", name_loop->name);
+		fclose(f);
 	}
-	dbg("storing data for device '%s' in '%s'", udev->devpath, filename);
 
-	fprintf(f, "P:%s\n", udev->devpath);
-	fprintf(f, "N:%s\n", udev->name);
-	list_for_each_entry(name_loop, &udev->symlink_list, node)
-		fprintf(f, "S:%s\n", name_loop->name);
-	fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
-	if (udev->partitions)
-		fprintf(f, "A:%u\n", udev->partitions);
-	if (udev->ignore_remove)
-		fprintf(f, "R:%u\n", udev->ignore_remove);
-	list_for_each_entry(name_loop, &udev->env_list, node)
-		fprintf(f, "E:%s\n", name_loop->name);
-	fclose(f);
-
-exit:
+	/* add name to index */
+	name_index(udev->dev->devpath, udev->name, 1);
+
 	return 0;
 }
 
-static int parse_db_file(struct udevice *udev, const char *filename)
+int udev_db_get_device(struct udevice *udev, const char *devpath)
 {
+	struct stat stats;
+	char filename[PATH_SIZE];
 	char line[PATH_SIZE];
-	unsigned int major, minor;
+	unsigned int maj, min;
 	char *bufline;
 	char *buf;
 	size_t bufsize;
 	size_t cur;
 	size_t count;
 
+	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));
+		return -1;
+	}
+	if ((stats.st_mode & S_IFMT) == S_IFLNK) {
+		char target[NAME_SIZE];
+		int target_len;
+
+		info("found a symlink as db file");
+		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));
+			return -1;
+		}
+		dbg("db link points to '%s'", target);
+		strlcpy(udev->name, target, sizeof(udev->name));
+		return 0;
+	}
+
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		err("unable to read db file '%s'", filename);
+		info("error reading db file %s: %s", filename, strerror(errno));
 		return -1;
 	}
 
@@ -124,12 +237,6 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 		cur += count+1;
 
 		switch(bufline[0]) {
-		case 'P':
-			if (count > sizeof(udev->devpath))
-				count = sizeof(udev->devpath);
-			memcpy(udev->devpath, &bufline[2], count-2);
-			udev->devpath[count-2] = '\0';
-			break;
 		case 'N':
 			if (count > sizeof(udev->name))
 				count = sizeof(udev->name);
@@ -141,8 +248,8 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 				count = sizeof(line);
 			memcpy(line, &bufline[2], count-2);
 			line[count-2] = '\0';
-			sscanf(line, "%u:%u", &major, &minor);
-			udev->devt = makedev(major, minor);
+			sscanf(line, "%u:%u", &maj, &min);
+			udev->devt = makedev(maj, min);
 			break;
 		case 'S':
 			if (count > sizeof(line))
@@ -151,6 +258,13 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 			line[count-2] = '\0';
 			name_list_add(&udev->symlink_list, line, 0);
 			break;
+		case 'L':
+			if (count > sizeof(line))
+				count =  sizeof(line);
+			memcpy(line, &bufline[2], count-2);
+			line[count-2] = '\0';
+			udev->link_priority = atoi(line);
+			break;
 		case 'A':
 			if (count > sizeof(line))
 				count =  sizeof(line);
@@ -185,170 +299,48 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 int udev_db_delete_device(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
+	struct name_entry *name_loop;
 
-	get_db_filename(udev->devpath, filename, sizeof(filename));
-	unlink(filename);
-
-	return 0;
-}
-
-int udev_db_get_device(struct udevice *udev, const char *devpath)
-{
-	char filename[PATH_SIZE];
+	if (udev->test_run)
+		return 0;
 
-	get_db_filename(devpath, filename, sizeof(filename));
+	devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename));
+	unlink(filename);
 
-	if (parse_db_file(udev, filename) != 0)
-		return -1;
+	name_index(udev->dev->devpath, udev->name, 0);
+	list_for_each_entry(name_loop, &udev->symlink_list, node)
+		name_index(udev->dev->devpath, name_loop->name, 0);
 
 	return 0;
 }
 
-int udev_db_search_name(char *devpath, size_t len, const char *name)
-{
-	DIR *dir;
-
-	dir = opendir(udev_db_path);
-	if (dir == NULL) {
-		err("unable to open udev_db '%s'", udev_db_path);
-		return -1;
-	}
-
-	while (1) {
-		struct dirent *ent;
-		char filename[PATH_SIZE];
-		char path[PATH_SIZE];
-		char nodename[PATH_SIZE];
-		char *bufline;
-		char *buf;
-		size_t bufsize;
-		size_t cur;
-		size_t count;
-
-		ent = readdir(dir);
-		if (ent == NULL || ent->d_name[0] == '\0')
-			break;
-
-		if (ent->d_name[0] == '.')
-			continue;
-
-		snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
-		filename[sizeof(filename)-1] = '\0';
-		dbg("looking at '%s'", filename);
-
-		if (file_map(filename, &buf, &bufsize) != 0) {
-			err("unable to read db file '%s'", filename);
-			continue;
-		}
-
-		cur = 0;
-		while (cur < bufsize) {
-			count = buf_get_line(buf, bufsize, cur);
-			bufline = &buf[cur];
-			cur += count+1;
-
-			switch(bufline[0]) {
-			case 'P':
-				if (count > sizeof(path))
-					count = sizeof(path);
-				memcpy(path, &bufline[2], count-2);
-				path[count-2] = '\0';
-				break;
-			case 'N':
-			case 'S':
-				if (count > sizeof(nodename))
-					count = sizeof(nodename);
-				memcpy(nodename, &bufline[2], count-2);
-				nodename[count-2] = '\0';
-				dbg("compare '%s' '%s'", nodename, name);
-				if (strcmp(nodename, name) == 0) {
-					memcpy(devpath, &bufline[2], count-2);
-					devpath[count-2] = '\0';
-					file_unmap(buf, bufsize);
-					closedir(dir);
-					return 0;
-				}
-				break;
-			default:
-				continue;
-			}
-		}
-		file_unmap(buf, bufsize);
-	}
-
-	closedir(dir);
-	return -1;
-}
-
-int udev_db_dump_names(int (*handler_function)(const char *path, const char *name))
+int udev_db_get_all_entries(struct list_head *name_list)
 {
+	char dbpath[PATH_MAX];
 	DIR *dir;
 
-	dir = opendir(udev_db_path);
+	strlcpy(dbpath, udev_root, sizeof(dbpath));
+	strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
+	dir = opendir(dbpath);
 	if (dir == NULL) {
-		err("unable to open udev_db '%s'", udev_db_path);
+		info("no udev_db available '%s': %s", dbpath, strerror(errno));
 		return -1;
 	}
 
 	while (1) {
 		struct dirent *ent;
-		char filename[PATH_SIZE];
-		char path[PATH_SIZE];
-		char nodename[PATH_SIZE];
-		char *bufline;
-		char *buf;
-		size_t bufsize;
-		size_t cur;
-		size_t count;
+		char device[PATH_SIZE];
 
 		ent = readdir(dir);
 		if (ent == NULL || ent->d_name[0] == '\0')
 			break;
-
 		if (ent->d_name[0] == '.')
 			continue;
 
-		snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
-		filename[sizeof(filename)-1] = '\0';
-		dbg("looking at '%s'", filename);
-
-		if (file_map(filename, &buf, &bufsize) != 0) {
-			err("unable to read db file '%s'", filename);
-			continue;
-		}
-
-		path[0] = '\0';
-		nodename[0] = '\0';
-		cur = 0;
-		while (cur < bufsize) {
-			count = buf_get_line(buf, bufsize, cur);
-			bufline = &buf[cur];
-			cur += count+1;
-
-			switch(bufline[0]) {
-			case 'P':
-				if (count > sizeof(path))
-					count = sizeof(path);
-				memcpy(path, &bufline[2], count-2);
-				path[count-2] = '\0';
-				break;
-			case 'N':
-				if (count > sizeof(nodename))
-					count = sizeof(nodename);
-				memcpy(nodename, &bufline[2], count-2);
-				nodename[count-2] = '\0';
-				break;
-			default:
-				continue;
-			}
-		}
-		file_unmap(buf, bufsize);
-
-		if (path[0] == '\0' || nodename[0] == '\0')
-			continue;
-
-		if (handler_function(path, nodename) != 0)
-			break;
+		strlcpy(device, ent->d_name, sizeof(device));
+		path_decode(device);
+		name_list_add(name_list, device, 1);
+		dbg("added '%s'", device);
 	}
 
 	closedir(dir);