diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-01-19 18:05:28 +0900 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-01-19 11:41:28 +0100 |
commit | 22bc57c58a3ad7570209e2ead6fa17e7d9b006cc (patch) | |
tree | dcd0c9919d320e1591b2ac92305ddb23000aedab /src/basic/fs-util.c | |
parent | 8f2e9686598cef76ba8038c25232428938fedb05 (diff) | |
download | systemd-22bc57c58a3ad7570209e2ead6fa17e7d9b006cc.tar.gz |
fs-util: chase_symlinks(): support empty root
The commit b1bfb848046e457f3cd623286b8cc1a5e5440023 makes chase_symlinks()
recognize empty string for root as an invalid parameter. However,
empty root is often used e.g. systemd-nspawn.
This makes chase_symlinks() support empty string safely.
Fixes #7927.
Diffstat (limited to 'src/basic/fs-util.c')
-rw-r--r-- | src/basic/fs-util.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index cb56e03d15..4bf25e32e0 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -660,13 +660,9 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags, * function what to do when encountering a symlink with an absolute path as directory: prefix it by the * specified path. */ - if (original_root) { - if (isempty(original_root)) /* What's this even supposed to mean? */ - return -EINVAL; - - if (path_equal(original_root, "/")) /* A root directory of "/" is identical to none */ - original_root = NULL; - } + /* A root directory of "/" or "" is identical to none */ + if (isempty(original_root) || path_equal(original_root, "/")) + original_root = NULL; if (original_root) { r = path_make_absolute_cwd(original_root, &root); |