X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-node.c;h=36f6f6d9930a078587a46417bf675bd7f6a65423;hb=2ffc9cc1917b1bb6fe86881a94a47dce9aa15168;hp=965017240cf9b4bcb8f8358726c5c8c76733420b;hpb=540f46698dd5a3bed767fa1c761ead1c9e41ed2e;p=elogind.git diff --git a/udev/udev-node.c b/udev/udev-node.c index 965017240..36f6f6d99 100644 --- a/udev/udev-node.c +++ b/udev/udev-node.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Kay Sievers + * Copyright (C) 2003-2008 Kay Sievers * * 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 @@ -32,31 +32,20 @@ #define TMP_FILE_EXT ".udev-tmp" /* reverse mapping from the device file name to the devpath */ -static int name_index(struct udev *udev, const char *devpath, const char *name, int add) +static int name_index(struct udev_device *dev, const char *name, int add) { - char device[UTIL_PATH_SIZE]; + struct udev *udev = udev_device_get_udev(dev); + char name_enc[UTIL_PATH_SIZE]; char filename[UTIL_PATH_SIZE * 2]; - size_t devlen = strlen(udev_get_dev_path(udev))+1; - size_t start; - int fd; - - /* directory with device name */ - util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename)); - start = util_strlcat(filename, "/.udev/names/", sizeof(filename)); - util_strlcat(filename, &name[devlen], sizeof(filename)); - util_path_encode(&filename[start], sizeof(filename) - start); - /* entry with the devpath */ - util_strlcpy(device, devpath, sizeof(device)); - util_path_encode(device, sizeof(device)); - util_strlcat(filename, "/", sizeof(filename)); - util_strlcat(filename, device, sizeof(filename)); + + util_path_encode(&name[strlen(udev_get_dev_path(udev))+1], name_enc, sizeof(name_enc)); + snprintf(filename, sizeof(filename), "%s/.udev/names/%s/%u:%u", udev_get_dev_path(udev), name_enc, + major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev))); if (add) { dbg(udev, "creating index: '%s'\n", filename); util_create_path(udev, filename); - fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644); - if (fd > 0) - close(fd); + symlink(udev_device_get_devpath(dev), filename); } else { dbg(udev, "removing index: '%s'\n", filename); unlink(filename); @@ -68,7 +57,6 @@ static int name_index(struct udev *udev, const char *devpath, const char *name, int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid) { struct udev *udev = udev_device_get_udev(dev); - char filename[UTIL_PATH_SIZE]; struct stat stats; int preserve = 0; int err = 0; @@ -81,14 +69,8 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod else mode |= S_IFCHR; - if (file == NULL) { + if (file == NULL) file = udev_device_get_devnode(dev); - } else if (file[0] != '/') { - util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename)); - util_strlcat(filename, "/", sizeof(filename)); - util_strlcat(filename, file, sizeof(filename)); - file = filename; - } if (lstat(file, &stats) == 0) { if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devnum)) { @@ -99,8 +81,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)]; info(udev, "atomically replace existing file '%s'\n", file); - util_strlcpy(file_tmp, file, sizeof(file_tmp)); - util_strlcat(file_tmp, TMP_FILE_EXT, sizeof(file_tmp)); + util_strscpyl(file_tmp, sizeof(file_tmp), file, TMP_FILE_EXT, NULL); unlink(file_tmp); udev_selinux_setfscreatecon(udev, file_tmp, mode); err = mknod(file_tmp, mode, devnum); @@ -152,10 +133,11 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) { struct stat stats; char target[UTIL_PATH_SIZE]; + char *s; + size_t l; char slink_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)]; int i = 0; int tail = 0; - int len; int err = 0; /* use relative link */ @@ -165,12 +147,18 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) tail = i+1; i++; } + s = target; + l = sizeof(target); while (slink[i] != '\0') { if (slink[i] == '/') - util_strlcat(target, "../", sizeof(target)); + l = util_strpcpy(&s, l, "../"); i++; } - util_strlcat(target, &node[tail], sizeof(target)); + l = util_strscpy(s, l, &node[tail]); + if (l == 0) { + err = -EINVAL; + goto exit; + } /* preserve link with correct target, do not replace node of other device */ if (lstat(slink, &stats) == 0) { @@ -192,6 +180,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) } } else if (S_ISLNK(stats.st_mode)) { char buf[UTIL_PATH_SIZE]; + int len; dbg(udev, "found existing symlink '%s'\n", slink); len = readlink(slink, buf, sizeof(buf)); @@ -215,8 +204,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) } info(udev, "atomically replace '%s'\n", slink); - util_strlcpy(slink_tmp, slink, sizeof(slink_tmp)); - util_strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp)); + util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL); unlink(slink_tmp); udev_selinux_setfscreatecon(udev, slink, S_IFLNK); err = symlink(target, slink_tmp); @@ -229,7 +217,6 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) if (err != 0) { err(udev, "rename(%s, %s) failed: %m\n", slink_tmp, slink); unlink(slink_tmp); - goto exit; } exit: return err; @@ -237,16 +224,16 @@ exit: static int name_index_get_devices(struct udev *udev, const char *name, struct udev_list_node *dev_list) { - char dirname[PATH_MAX]; - size_t devlen = strlen(udev_get_dev_path(udev))+1; - size_t start; + char dirname[UTIL_PATH_SIZE]; + char *s; + size_t l; DIR *dir; int count = 0; - util_strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname)); - start = util_strlcat(dirname, "/.udev/names/", sizeof(dirname)); - util_strlcat(dirname, &name[devlen], sizeof(dirname)); - util_path_encode(&dirname[start], sizeof(dirname) - start); + s = dirname; + l = util_strpcpyl(&s, sizeof(dirname), udev_get_dev_path(udev), + "/.udev/names/", NULL); + util_path_encode(&name[strlen(udev_get_dev_path(udev))+1], s, l); dir = opendir(dirname); if (dir == NULL) { dbg(udev, "no index directory '%s': %m\n", dirname); @@ -256,19 +243,23 @@ static int name_index_get_devices(struct udev *udev, const char *name, struct ud dbg(udev, "found index directory '%s'\n", dirname); while (1) { - struct dirent *ent; - char device[UTIL_PATH_SIZE]; + struct dirent *dent; + char devpath[UTIL_PATH_SIZE]; + char syspath[UTIL_PATH_SIZE]; + int len; - ent = readdir(dir); - if (ent == NULL || ent->d_name[0] == '\0') + dent = readdir(dir); + if (dent == NULL || dent->d_name[0] == '\0') break; - if (ent->d_name[0] == '.') + if (dent->d_name[0] == '.') continue; - util_strlcpy(device, udev_get_sys_path(udev), sizeof(device)); - util_strlcat(device, ent->d_name, sizeof(device)); - util_path_decode(device); - udev_list_entry_add(udev, dev_list, device, NULL, 1, 0); + len = readlinkat(dirfd(dir), dent->d_name, devpath, sizeof(devpath)); + if (len < 0 || (size_t)len >= sizeof(devpath)) + continue; + devpath[len] = '\0'; + util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL); + udev_list_entry_add(udev, dev_list, syspath, NULL, 1, 0); count++; } closedir(dir); @@ -320,7 +311,7 @@ static int update_link(struct udev_device *dev, const char *slink) udev_device_get_devnode(dev)); } else if (target[0] == '\0' || udev_device_get_devlink_priority(dev) >= priority) { priority = udev_device_get_devlink_priority(dev); - util_strlcpy(target, udev_device_get_devnode(dev), sizeof(target)); + util_strscpy(target, sizeof(target), udev_device_get_devnode(dev)); } continue; } @@ -341,7 +332,7 @@ static int update_link(struct udev_device *dev, const char *slink) priority); if (target[0] == '\0' || udev_device_get_devlink_priority(dev_db) > priority) { priority = udev_device_get_devlink_priority(dev_db); - util_strlcpy(target, devnode, sizeof(target)); + util_strscpy(target, sizeof(target), devnode); } } } @@ -394,7 +385,7 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev info(udev, "update old name, '%s' no longer belonging to '%s'\n", name, udev_device_get_devpath(dev)); - name_index(udev, udev_device_get_devpath(dev), name, 0); + name_index(dev, name, 0); update_link(dev, name); } @@ -408,7 +399,7 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev if (devnode != NULL && strcmp(devnode_old, devnode) != 0) { info(udev, "node has changed from '%s' to '%s'\n", devnode_old, devnode); - name_index(udev, udev_device_get_devpath(dev), devnode_old, 0); + name_index(dev, devnode_old, 0); update_link(dev, devnode_old); } } @@ -451,18 +442,18 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid) } /* add node to name index */ - name_index(udev, udev_device_get_devpath(dev), udev_device_get_devnode(dev), 1); + name_index(dev, udev_device_get_devnode(dev), 1); /* create/update symlinks, add symlinks to name index */ udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) { - name_index(udev, udev_device_get_devpath(dev), udev_list_entry_get_name(list_entry), 1); + name_index(dev, udev_list_entry_get_name(list_entry), 1); update_link(dev, udev_list_entry_get_name(list_entry)); } exit: return err; } -extern int udev_node_remove(struct udev_device *dev) +int udev_node_remove(struct udev_device *dev) { struct udev *udev = udev_device_get_udev(dev); struct udev_list_entry *list_entry; @@ -473,11 +464,11 @@ extern int udev_node_remove(struct udev_device *dev) int num; /* remove node from name index */ - name_index(udev, udev_device_get_devpath(dev), udev_device_get_devnode(dev), 0); + name_index(dev, udev_device_get_devnode(dev), 0); /* remove,update symlinks, remove symlinks from name index */ udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) { - name_index(udev, udev_device_get_devpath(dev), udev_list_entry_get_name(list_entry), 0); + name_index(dev, udev_list_entry_get_name(list_entry), 0); update_link(dev, udev_list_entry_get_name(list_entry)); }