SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev: use readlink_malloc() or its friend

Browse Source 
Follow-up for a2554acec6 and
7006860271.
This commit is contained in:
Yu Watanabe
2018-10-14 19:59:49 +02:00
committed by Lennart Poettering
parent 18094bdcf4
commit e7aa9512e4
2 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-node.c
+7 -11
View File
@@ -49,18 +49,14 @@ static int node_symlink(sd_device *dev, const char *node, const char *slink) {
log_error("Conflicting device node '%s' found, link to '%s' will not be created.", slink, node);
return -EOPNOTSUPP;
} else if (S_ISLNK(stats.st_mode)) {
char buf[PATH_MAX];
ssize_t len;
_cleanup_free_ char *buf = NULL;
len = readlink(slink, buf, sizeof(buf));
if (len > 0 && len < (ssize_t) sizeof(buf)) {
buf[len] = '\0';
if (streq(target, buf)) {
log_debug("Preserve already existing symlink '%s' to '%s'", slink, target);
(void) label_fix(slink, LABEL_IGNORE_ENOENT);
(void) utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
return 0;
}
if (readlink_malloc(slink, &buf) >= 0 &&
streq(target, buf)) {
log_debug("Preserve already existing symlink '%s' to '%s'", slink, target);
(void) label_fix(slink, LABEL_IGNORE_ENOENT);
(void) utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
return 0;
}
}
} else {