picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

install: don't enter loop when traversing a template symlinks 

Before this patch, if we'd encounter an instance or template symlink
while traversing a chain of symlinks we'd fill in the instance name and
retry the iteration. This makes no sense if the resulting name is
actually the same as we are coming from, as we'd just spin a couple of
times in the loop, until the UNIT_FILE_FOLLOW_SYMLINK_MAX iteration
limit is hit.

Fix this, by accepted the symlink as it is, if it identical to what we
filled in.
This commit is contained in:
Lennart Poettering 2017-02-07 16:22:49 +01:00
parent d52fbaa58c
commit 9f6cbcf53c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/shared/install.c
View File

@ -1354,7 +1354,8 @@ static int install_info_follow(
InstallContext *c,
UnitFileInstallInfo *i,
const char *root_dir,
SearchFlags flags) {
SearchFlags flags,
bool ignore_different_name) {
assert(c);
assert(i);
@ -1367,7 +1368,7 @@ static int install_info_follow(
/* If the basename doesn't match, the caller should add a
* complete new entry for this. */
if (!streq(basename(i->symlink_target), i->name))
if (!ignore_different_name && !streq(basename(i->symlink_target), i->name))
return -EXDEV;
free_and_replace(i->path, i->symlink_target);
@ -1415,7 +1416,7 @@ static int install_info_traverse(
return -ELOOP;
}
r = install_info_follow(c, i, paths->root_dir, flags);
r = install_info_follow(c, i, paths->root_dir, flags, false);
if (r == -EXDEV) {
_cleanup_free_ char *buffer = NULL;
const char *bn;
@ -1439,6 +1440,18 @@ static int install_info_traverse(
if (r < 0)
return r;
if (streq(buffer, i->name)) {
/* We filled in the instance, and the target stayed the same? If so, then let's
* honour the link as it is. */
r = install_info_follow(c, i, paths->root_dir, flags, true);
if (r < 0)
return r;
continue;
}
bn = buffer;
}