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

fs-util: change chase_symlinks() behaviour in regards to escaping the root dir

Browse Source 
Previously, we'd generate an EINVAL error if it is attempted to escape a root
directory with relative ".." symlinks. With this commit this is changed so that
".." from the root directory is a NOP, following the kernel's own behaviour
where /.. is equivalent to /.

As suggested by @keszybz.
This commit is contained in:
Lennart Poettering
2016-12-01 00:25:51 +01:00
parent df878e682d
commit a4eaf3cf82
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-fs-util.c
+4 -4
View File
@@ -97,21 +97,21 @@ static void test_chase_symlinks(void) {
result = mfree(result);
r = chase_symlinks(p, temp, &result);
assert_se(r == -EINVAL);
assert_se(r == 0 && path_equal(result, temp));
p = strjoina(temp, "/6dotsusr");
assert_se(symlink("../../../usr", p) >= 0);
result = mfree(result);
r = chase_symlinks(p, temp, &result);
assert_se(r == -EINVAL);
assert_se(r == 0 && path_equal(result, q));
p = strjoina(temp, "/top/8dotsusr");
assert_se(symlink("../../../../usr", p) >= 0);
result = mfree(result);
r = chase_symlinks(p, temp, &result);
assert_se(r == -EINVAL);
assert_se(r == 0 && path_equal(result, q));
/* Paths that contain repeated slashes */
@@ -137,7 +137,7 @@ static void test_chase_symlinks(void) {
result = mfree(result);
r = chase_symlinks("/etc/./.././", "/etc", &result);
assert_se(r == -EINVAL);
assert_se(r == 0 && path_equal(result, "/etc"));
result = mfree(result);
r = chase_symlinks("/etc/machine-id/foo", NULL, &result);