summaryrefslogtreecommitdiff
path: root/src/install.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-16 02:56:40 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-16 02:56:40 +0200
commit992f87e192673d74cbdc4a50c27b8169401c6720 (patch)
tree67c355b46c2e3195ef8cb260364175ad0a9fc5cc /src/install.c
parent7461d1b76f53ed8dc2d6dc2d63d473d4b165e839 (diff)
install: refuse installation of symlinked units
Diffstat (limited to 'src/install.c')
-rw-r--r--src/install.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/install.c b/src/install.c
index 6fc2a9fbcd..bd23a938f3 100644
--- a/src/install.c
+++ b/src/install.c
@@ -24,6 +24,7 @@
#include <getopt.h>
#include <errno.h>
#include <unistd.h>
+#include <fcntl.h>
#include "log.h"
#include "path-lookup.h"
@@ -722,22 +723,32 @@ static int install_info_apply(LookupPaths *paths, InstallInfo *i, const char *co
assert(i);
STRV_FOREACH(p, paths->unit_path) {
+ int fd;
if (!(filename = path_make_absolute(i->name, *p))) {
log_error("Out of memory");
return -ENOMEM;
}
- if ((f = fopen(filename, "re")))
- break;
+ /* Ensure that we don't follow symlinks */
+ if ((fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NOCTTY)) >= 0)
+ if ((f = fdopen(fd, "re")))
+ break;
- free(filename);
- filename = NULL;
+ if (errno == ELOOP) {
+ log_error("Refusing to operate on symlinks, please pass unit names or absolute paths to unit files.");
+ free(filename);
+ return -errno;
+ }
if (errno != ENOENT) {
log_error("Failed to open %s: %m", filename);
+ free(filename);
return -errno;
}
+
+ free(filename);
+ filename = NULL;
}
if (!f) {
@@ -810,7 +821,7 @@ static int do_realize(bool enabled) {
}
if (arg_where == WHERE_SYSTEM && sd_booted() <= 0) {
- log_info("systemd is not running, --realize has not effect.");
+ log_info("systemd is not running, --realize has no effect.");
return 0;
}