shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

fix broken symlink resolving

Browse Source
This commit is contained in:
Kay Sievers 2008-09-16 09:53:36 -07:00
parent c68a293678
commit 44589a0c73
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
udev/udev_sysfs.c
View File

@ -40,6 +40,39 @@ struct sysfs_attr {
char value_local[UTIL_NAME_SIZE]; char value_local[UTIL_NAME_SIZE];
}; };
static int resolve_sys_link(struct udev *udev, char *path, size_t size)
{
char link_path[UTIL_PATH_SIZE];
char link_target[UTIL_PATH_SIZE];
int len;
int i;
int back;
util_strlcpy(link_path, udev_get_sys_path(udev), sizeof(link_path));
util_strlcat(link_path, path, sizeof(link_path));
len = readlink(link_path, link_target, sizeof(link_target));
if (len <= 0)
return -1;
link_target[len] = '\0';
dbg(udev, "path link '%s' points to '%s'\n", path, link_target);
for (back = 0; strncmp(&link_target[back * 3], "../", 3) == 0; back++)
;
dbg(udev, "base '%s', tail '%s', back %i\n", path, &link_target[back * 3], back);
for (i = 0; i <= back; i++) {
char *pos = strrchr(path, '/');
if (pos == NULL)
return -1;
pos[0] = '\0';
}
dbg(udev, "after moving back '%s'\n", path);
util_strlcat(path, "/", size);
util_strlcat(path, &link_target[back * 3], size);
return 0;
}
int sysfs_init(void) int sysfs_init(void)
{ {
INIT_LIST_HEAD(&dev_list); INIT_LIST_HEAD(&dev_list);
@ -144,7 +177,7 @@ struct sysfs_device *sysfs_device_get(struct udev *udev, const char *devpath)
return NULL; return NULL;
} }
if (S_ISLNK(statbuf.st_mode)) { if (S_ISLNK(statbuf.st_mode)) {
if (util_resolve_sys_link(udev, devpath_real, sizeof(devpath_real)) != 0) if (resolve_sys_link(udev, devpath_real, sizeof(devpath_real)) != 0)
return NULL; return NULL;
/* now look for device in cache after path translation */ /* now look for device in cache after path translation */
@ -258,7 +291,7 @@ struct sysfs_device *sysfs_device_get_parent(struct udev *udev, struct sysfs_dev
device_link: device_link:
util_strlcpy(parent_devpath, dev->devpath, sizeof(parent_devpath)); util_strlcpy(parent_devpath, dev->devpath, sizeof(parent_devpath));
util_strlcat(parent_devpath, "/device", sizeof(parent_devpath)); util_strlcat(parent_devpath, "/device", sizeof(parent_devpath));
if (util_resolve_sys_link(udev, parent_devpath, sizeof(parent_devpath)) != 0) if (resolve_sys_link(udev, parent_devpath, sizeof(parent_devpath)) != 0)
return NULL; return NULL;
/* get parent and remember it */ /* get parent and remember it */
@ -460,7 +493,7 @@ out:
return 0; return 0;
found: found:
if (S_ISLNK(statbuf.st_mode)) if (S_ISLNK(statbuf.st_mode))
util_resolve_sys_link(udev, path, sizeof(path_full) - sysfs_len); resolve_sys_link(udev, path, sizeof(path_full) - sysfs_len);
util_strlcpy(devpath_full, path, len); util_strlcpy(devpath_full, path, len);
return 1; return 1;
} }

10
udev/udevadm-trigger.c
View File

@ -65,7 +65,6 @@ static int delay_device(const char *devpath)
static int device_list_insert(struct udev *udev, const char *path) static int device_list_insert(struct udev *udev, const char *path)
{ {
char filename[UTIL_PATH_SIZE]; char filename[UTIL_PATH_SIZE];
char devpath[UTIL_PATH_SIZE];
struct stat statbuf; struct stat statbuf;
dbg(udev, "add '%s'\n" , path); dbg(udev, "add '%s'\n" , path);
@ -78,16 +77,15 @@ static int device_list_insert(struct udev *udev, const char *path)
if (!(statbuf.st_mode & S_IWUSR)) if (!(statbuf.st_mode & S_IWUSR))
return -1; return -1;
util_strlcpy(devpath, &path[strlen(udev_get_sys_path(udev))], sizeof(devpath));
/* resolve possible link to real target */ /* resolve possible link to real target */
if (lstat(path, &statbuf) < 0) util_strlcpy(filename, path, sizeof(filename));
if (lstat(filename, &statbuf) < 0)
return -1; return -1;
if (S_ISLNK(statbuf.st_mode)) if (S_ISLNK(statbuf.st_mode))
if (util_resolve_sys_link(udev, devpath, sizeof(devpath)) != 0) if (util_resolve_sys_link(udev, filename, sizeof(filename)) != 0)
return -1; return -1;
name_list_add(udev, &device_list, devpath, 1); name_list_add(udev, &device_list, filename, 1);
return 0; return 0;
} }