From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Jan 2018 11:00:40 +0000 (+0100)
Subject: fs-util: refuse taking a relative path to chase if "root" is specified and CHASE_PREF... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6bfd45823cd36620dabd4f6c979d784041a20dec;p=elogind.git

fs-util: refuse taking a relative path to chase if "root" is specified and CHASE_PREFIX_ROOT is set

If we take a relative path we first make it absolute, based on the
current working directory. But if CHASE_PREFIX_ROOT is passe we are
supposed to make the path absolute taking the specified root path into
account, but that makes no sense if we talk about the current working
directory as that is relative to the host's root in any case. Hence,
let's refuse this politely.
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index bbc464e31..bd7e3db64 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -688,8 +688,14 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
                 if (r < 0)
                         return r;
 
-                if (flags & CHASE_PREFIX_ROOT)
+                if (flags & CHASE_PREFIX_ROOT) {
+
+                        /* We don't support relative paths in combination with a root directory */
+                        if (!path_is_absolute(path))
+                                return -EINVAL;
+
                         path = prefix_roota(root, path);
+                }
         }
 
         r = path_make_absolute_cwd(path, &buffer);