X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=3348c9a02c76d5cf89fa893e367d2837b9a8953c;hp=86a3ea7a39bb6d20f6c5f51feae1b4c5fe60fdbf;hb=ca0ac81f36f343047847168665c19d2080a64a6e;hpb=e3e7358137a35849f81a8e18ca548ded22a2b5cc diff --git a/udev_db.c b/udev_db.c index 86a3ea7a3..3348c9a02 100644 --- a/udev_db.c +++ b/udev_db.c @@ -1,6 +1,4 @@ /* - * udev_db.c - * * Copyright (C) 2003 Greg Kroah-Hartman * Copyright (C) 2004-2005 Kay Sievers * @@ -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,42 +27,105 @@ #include #include #include +#include +#include #include "udev.h" +#include "udev_selinux.h" -static int devpath_to_db_path(const char *devpath, char *filename, size_t len) +static size_t devpath_to_db_path(const char *devpath, char *filename, size_t len) { - size_t start, end, i; + 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); - end = strlcat(filename, devpath, len); - if (end > len) - end = len; - - /* replace '/' to transform path into a filename */ - for (i = start+1; i < end; i++) - if (filename[i] == '/') - filename[i] = PATH_TO_NAME_CHAR; + 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'\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'\n", filename); + unlink(filename); + delete_path(filename); + } return 0; } -static int db_file_to_devpath(const char *filename, char *devpath, size_t len) +int udev_db_get_devices_by_name(const char *name, struct list_head *name_list) { - size_t end, i; + 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\n", dirname, strerror(errno)); + rc = -1; + goto out; + } - strlcpy(devpath, "/", len); - end = strlcat(devpath, filename, len); + info("found index directory '%s'\n", dirname); + while (1) { + struct dirent *ent; + char device[PATH_SIZE]; - /* replace PATH_TO_NAME_CHAR to transform name into devpath */ - for (i = 1; i < end; i++) - if (devpath[i] == PATH_TO_NAME_CHAR) - devpath[i] = '/'; + ent = readdir(dir); + if (ent == NULL || ent->d_name[0] == '\0') + break; + if (ent->d_name[0] == '.') + continue; - return 0; + 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) @@ -76,35 +137,46 @@ int udev_db_add_device(struct udevice *udev) devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename)); create_path(filename); + unlink(filename); /* - * create only a symlink with the name as the target - * if we don't have any interesting data to remember + * 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 (list_empty(&udev->symlink_list) && list_empty(&udev->env_list) && !udev->partitions && !udev->ignore_remove) { - dbg("nothing interesting to store, create symlink"); - unlink(filename); - 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 { - struct name_entry *name_loop; 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)); + 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) + 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->partitions) + if (udev->link_priority != 0) + fprintf(f, "L:%u\n", udev->link_priority); + if (udev->event_timeout >= 0) + fprintf(f, "T:%u\n", udev->event_timeout); + if (udev->partitions != 0) fprintf(f, "A:%u\n", udev->partitions); if (udev->ignore_remove) fprintf(f, "R:%u\n", udev->ignore_remove); @@ -112,6 +184,10 @@ int udev_db_add_device(struct udevice *udev) fprintf(f, "E:%s\n", name_loop->name); fclose(f); } + + /* add name to index */ + name_index(udev->dev->devpath, udev->name, 1); + return 0; } @@ -120,39 +196,39 @@ 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; - 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; } @@ -162,47 +238,35 @@ int udev_db_get_device(struct udevice *udev, const char *devpath) bufline = &buf[cur]; cur += count+1; + if (count > sizeof(line)) + count = sizeof(line); + memcpy(line, &bufline[2], count-2); + line[count-2] = '\0'; + switch(bufline[0]) { case 'N': - if (count > sizeof(udev->name)) - count = sizeof(udev->name); - memcpy(udev->name, &bufline[2], count-2); - udev->name[count-2] = '\0'; + strlcpy(udev->name, line, sizeof(udev->name)); break; case 'M': - if (count > sizeof(line)) - 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)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; name_list_add(&udev->symlink_list, line, 0); break; + case 'L': + udev->link_priority = atoi(line); + break; + case 'T': + udev->event_timeout = atoi(line); + break; case 'A': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; udev->partitions = atoi(line); break; case 'R': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; udev->ignore_remove = atoi(line); break; case 'E': - if (count > sizeof(line)) - count = sizeof(line); - memcpy(line, &bufline[2], count-2); - line[count-2] = '\0'; name_list_add(&udev->env_list, line, 0); break; } @@ -218,108 +282,19 @@ int udev_db_get_device(struct udevice *udev, const char *devpath) 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); - return 0; -} - -int udev_db_lookup_name(const char *name, char *devpath, size_t len) -{ - char dbpath[PATH_MAX]; - DIR *dir; - int found = 0; - - strlcpy(dbpath, udev_root, sizeof(dbpath)); - strlcat(dbpath, "/"DB_DIR, sizeof(dbpath)); - dir = opendir(dbpath); - if (dir == NULL) { - info("no udev_db available '%s': %s", dbpath, strerror(errno)); - return -1; - } - - while (!found) { - struct dirent *ent; - char filename[PATH_SIZE]; - char nodename[PATH_SIZE]; - struct stat stats; - char *bufline; - char *buf; - size_t bufsize; - size_t cur; - size_t count; + 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); - ent = readdir(dir); - if (ent == NULL || ent->d_name[0] == '\0') - break; - if (ent->d_name[0] == '.') - continue; - - snprintf(filename, sizeof(filename), "%s/%s", dbpath, ent->d_name); - filename[sizeof(filename)-1] = '\0'; - dbg("looking at '%s'", filename); - - if (lstat(filename, &stats) != 0) { - info("unable to read %s: %s", filename, strerror(errno)); - continue; - } - 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); - if (strcmp(name, target) == 0) { - db_file_to_devpath(ent->d_name, devpath, len); - found =1; - } - continue; - } - - if (file_map(filename, &buf, &bufsize) != 0) { - info("unable to read db file '%s': %s", filename, strerror(errno)); - continue; - } - - cur = 0; - while (cur < bufsize && !found) { - count = buf_get_line(buf, bufsize, cur); - bufline = &buf[cur]; - cur += count+1; - - switch(bufline[0]) { - 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) { - db_file_to_devpath(ent->d_name, devpath, len); - found = 1; - } - break; - default: - continue; - } - } - file_unmap(buf, bufsize); - } - - closedir(dir); - if (found) - return 0; - else - return -1; + return 0; } int udev_db_get_all_entries(struct list_head *name_list) @@ -331,14 +306,13 @@ 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; } while (1) { struct dirent *ent; - char filename[PATH_SIZE] = "/"; - size_t end, i; + char device[PATH_SIZE]; ent = readdir(dir); if (ent == NULL || ent->d_name[0] == '\0') @@ -346,12 +320,10 @@ int udev_db_get_all_entries(struct list_head *name_list) if (ent->d_name[0] == '.') continue; - end = strlcat(filename, ent->d_name, sizeof(filename)); - for (i = 1; i < end; i++) - if (filename[i] == PATH_TO_NAME_CHAR) - filename[i] = '/'; - name_list_add(name_list, filename, 1); - dbg("added '%s'", filename); + strlcpy(device, ent->d_name, sizeof(device)); + path_decode(device); + name_list_add(name_list, device, 1); + dbg("added '%s'\n", device); } closedir(dir);