X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fload-fragment.c;h=0d5d841429aeaaae1a4212f05a06a44ff365d8ea;hp=ff6e13e59932d1869770169fad6f4c8e8809c529;hb=41f9172f427bdbb8221c64029f78364b8dd4e527;hpb=ec8927ca5940e809f0b72f530582c76f1db4f065 diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index ff6e13e59..0d5d84142 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -42,9 +42,11 @@ #include "securebits.h" #include "missing.h" #include "unit-name.h" +#include "unit-printf.h" #include "bus-errors.h" #include "utf8.h" #include "path-util.h" +#include "syscall-list.h" #ifndef HAVE_SYSV_COMPAT int config_parse_warn_compat( @@ -105,49 +107,6 @@ int config_parse_unit_deps( return 0; } -int config_parse_unit_names( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - Unit *u = userdata; - char *w; - size_t l; - char *state; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - FOREACH_WORD_QUOTED(w, l, rvalue, state) { - char *t, *k; - int r; - - t = strndup(w, l); - if (!t) - return -ENOMEM; - - k = unit_name_printf(u, t); - free(t); - if (!k) - return -ENOMEM; - - r = unit_merge_by_name(u, k); - if (r < 0) - log_error("Failed to add name %s, ignoring: %s", k, strerror(-r)); - - free(k); - } - - return 0; -} - int config_parse_unit_string_printf( const char *filename, unsigned line, @@ -637,61 +596,6 @@ int config_parse_socket_bindtodevice( DEFINE_CONFIG_PARSE_ENUM(config_parse_output, exec_output, ExecOutput, "Failed to parse output specifier"); DEFINE_CONFIG_PARSE_ENUM(config_parse_input, exec_input, ExecInput, "Failed to parse input specifier"); -int config_parse_facility( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - - int *o = data, x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = log_facility_unshifted_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse log facility, ignoring: %s", filename, line, rvalue); - return 0; - } - - *o = (x << 3) | LOG_PRI(*o); - - return 0; -} - -int config_parse_level( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - - int *o = data, x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = log_level_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse log level, ignoring: %s", filename, line, rvalue); - return 0; - } - - *o = (*o & LOG_FACMASK) | x; - return 0; -} - int config_parse_exec_io_class( const char *filename, unsigned line, @@ -977,7 +881,7 @@ int config_parse_bounding_set( if (r < 0) { log_error("[%s:%u] Failed to parse capability bounding set, ignoring: %s", filename, line, rvalue); - return 0; + continue; } sum |= ((uint64_t) 1ULL) << (uint64_t) cap; @@ -991,34 +895,6 @@ int config_parse_bounding_set( return 0; } -int config_parse_exec_timer_slack_nsec( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - ExecContext *c = data; - unsigned long u; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if (safe_atolu(rvalue, &u) < 0) { - log_error("[%s:%u] Failed to parse time slack value, ignoring: %s", filename, line, rvalue); - return 0; - } - - c->timer_slack_nsec = u; - - return 0; -} - int config_parse_limit( const char *filename, unsigned line, @@ -1481,6 +1357,38 @@ int config_parse_service_sockets( return 0; } +int config_parse_service_timeout( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + + Service *s = userdata; + int r; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(s); + + r = config_parse_usec(filename, line, section, lvalue, ltype, rvalue, data, userdata); + + if (r) + return r; + + if (streq(lvalue, "TimeoutSec")) { + s->start_timeout_defined = true; + s->timeout_stop_usec = s->timeout_start_usec; + } else if (streq(lvalue, "TimeoutStartSec")) + s->start_timeout_defined = true; + + return 0; +} + int config_parse_unit_env_file( const char *filename, unsigned line, @@ -1562,6 +1470,7 @@ int config_parse_unit_condition_path( Unit *u = data; bool trigger, negate; Condition *c; + _cleanup_free_ char *p = NULL; assert(filename); assert(lvalue); @@ -1576,12 +1485,16 @@ int config_parse_unit_condition_path( if (negate) rvalue++; - if (!path_is_absolute(rvalue)) { - log_error("[%s:%u] Path in condition not absolute, ignoring: %s", filename, line, rvalue); + p = unit_full_printf(u, rvalue); + if (!p) + return -ENOMEM; + + if (!path_is_absolute(p)) { + log_error("[%s:%u] Path in condition not absolute, ignoring: %s", filename, line, p); return 0; } - c = condition_new(cond, rvalue, trigger, negate); + c = condition_new(cond, p, trigger, negate); if (!c) return -ENOMEM; @@ -1603,21 +1516,29 @@ int config_parse_unit_condition_string( Unit *u = data; bool trigger, negate; Condition *c; + _cleanup_free_ char *s = NULL; assert(filename); assert(lvalue); assert(rvalue); assert(data); - if ((trigger = rvalue[0] == '|')) + trigger = rvalue[0] == '|'; + if (trigger) rvalue++; - if ((negate = rvalue[0] == '!')) + negate = rvalue[0] == '!'; + if (negate) rvalue++; - if (!(c = condition_new(cond, rvalue, trigger, negate))) + s = unit_full_printf(u, rvalue); + if (!s) return -ENOMEM; + c = condition_new(cond, s, trigger, negate); + if (!c) + return log_oom(); + LIST_PREPEND(Condition, conditions, u->conditions, c); return 0; } @@ -2010,7 +1931,7 @@ int config_parse_unit_blkio_bandwidth(const char *filename, unsigned line, const } if (parse_bytes(l[1], &bytes) < 0 || bytes <= 0) { - log_error("[%s:%u] Failed to parse block IO bandwith value, ignoring: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse block IO bandwidth value, ignoring: %s", filename, line, rvalue); strv_free(l); return 0; } @@ -2101,6 +2022,88 @@ int config_parse_documentation( return r; } +static void syscall_set(uint32_t *p, int nr) { + p[nr >> 4] |= 1 << (nr & 31); +} + +static void syscall_unset(uint32_t *p, int nr) { + p[nr >> 4] &= ~(1 << (nr & 31)); +} + +int config_parse_syscall_filter( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + + ExecContext *c = data; + Unit *u = userdata; + bool invert = false; + char *w; + size_t l; + char *state; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(u); + + if (rvalue[0] == '~') { + invert = true; + rvalue++; + } + + if (!c->syscall_filter) { + size_t n; + + n = (syscall_max() + 31) >> 4; + c->syscall_filter = new(uint32_t, n); + if (!c->syscall_filter) + return -ENOMEM; + + memset(c->syscall_filter, invert ? 0xFF : 0, n * sizeof(uint32_t)); + + /* Add these by default */ + syscall_set(c->syscall_filter, __NR_execve); + syscall_set(c->syscall_filter, __NR_rt_sigreturn); +#ifdef __NR_sigreturn + syscall_set(c->syscall_filter, __NR_sigreturn); +#endif + syscall_set(c->syscall_filter, __NR_exit_group); + syscall_set(c->syscall_filter, __NR_exit); + } + + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + int id; + char *t; + + t = strndup(w, l); + if (!t) + return -ENOMEM; + + id = syscall_from_name(t); + free(t); + + if (id < 0) { + log_error("[%s:%u] Failed to parse syscall, ignoring: %s", filename, line, rvalue); + continue; + } + + if (invert) + syscall_unset(c->syscall_filter, id); + else + syscall_set(c->syscall_filter, id); + } + + c->no_new_privileges = true; + + return 0; +} + #define FOLLOW_MAX 8 static int open_follow(char **filename, FILE **_f, Set *names, char **_final) { @@ -2147,21 +2150,24 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_final) { } /* Try to open the file name, but don't if its a symlink */ - if ((fd = open(*filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW)) >= 0) + fd = open(*filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); + if (fd >= 0) break; if (errno != ELOOP) return -errno; /* Hmm, so this is a symlink. Let's read the name, and follow it manually */ - if ((r = readlink_and_make_absolute(*filename, &target)) < 0) + r = readlink_and_make_absolute(*filename, &target); + if (r < 0) return r; free(*filename); *filename = target; } - if (!(f = fdopen(fd, "re"))) { + f = fdopen(fd, "re"); + if (!f) { r = -errno; close_nointr_nofail(fd); return r; @@ -2185,7 +2191,8 @@ static int merge_by_names(Unit **u, Set *names, const char *id) { /* First try to merge in the other name into our * unit */ - if ((r = unit_merge_by_name(*u, k)) < 0) { + r = unit_merge_by_name(*u, k); + if (r < 0) { Unit *other; /* Hmm, we couldn't merge the other unit into @@ -2195,11 +2202,13 @@ static int merge_by_names(Unit **u, Set *names, const char *id) { other = manager_get_unit((*u)->manager, k); free(k); - if (other) - if ((r = unit_merge(other, *u)) >= 0) { + if (other) { + r = unit_merge(other, *u); + if (r >= 0) { *u = other; return merge_by_names(u, names, NULL); } + } return r; } @@ -2230,12 +2239,14 @@ static int load_from_path(Unit *u, const char *path) { if (path_is_absolute(path)) { - if (!(filename = strdup(path))) { + filename = strdup(path); + if (!filename) { r = -ENOMEM; goto finish; } - if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) { + r = open_follow(&filename, &f, symlink_names, &id); + if (r < 0) { free(filename); filename = NULL; @@ -2251,7 +2262,8 @@ static int load_from_path(Unit *u, const char *path) { /* Instead of opening the path right away, we manually * follow all symlinks and add their name to our unit * name set while doing so */ - if (!(filename = path_make_absolute(path, *p))) { + filename = path_make_absolute(path, *p); + if (!filename) { r = -ENOMEM; goto finish; } @@ -2263,8 +2275,6 @@ static int load_from_path(Unit *u, const char *path) { r = open_follow(&filename, &f, symlink_names, &id); if (r < 0) { - char *sn; - free(filename); filename = NULL; @@ -2272,9 +2282,7 @@ static int load_from_path(Unit *u, const char *path) { goto finish; /* Empty the symlink names for the next run */ - while ((sn = set_steal_first(symlink_names))) - free(sn); - + set_clear_free(symlink_names); continue; } @@ -2289,7 +2297,8 @@ static int load_from_path(Unit *u, const char *path) { } merged = u; - if ((r = merge_by_names(&merged, symlink_names, id)) < 0) + r = merge_by_names(&merged, symlink_names, id); + if (r < 0) goto finish; if (merged != u) { @@ -2298,7 +2307,6 @@ static int load_from_path(Unit *u, const char *path) { goto finish; } - zero(st); if (fstat(fileno(f), &st) < 0) { r = -errno; goto finish; @@ -2352,7 +2360,8 @@ int unit_load_fragment(Unit *u) { /* First, try to find the unit under its id. We always look * for unit files in the default directories, to make it easy * to override things by placing things in /etc/systemd/system */ - if ((r = load_from_path(u, u->id)) < 0) + r = load_from_path(u, u->id); + if (r < 0) return r; /* Try to find an alias we can load this with */ @@ -2362,7 +2371,8 @@ int unit_load_fragment(Unit *u) { if (t == u->id) continue; - if ((r = load_from_path(u, t)) < 0) + r = load_from_path(u, t); + if (r < 0) return r; if (u->load_state != UNIT_STUB) @@ -2372,7 +2382,8 @@ int unit_load_fragment(Unit *u) { /* And now, try looking for it under the suggested (originally linked) path */ if (u->load_state == UNIT_STUB && u->fragment_path) { - if ((r = load_from_path(u, u->fragment_path)) < 0) + r = load_from_path(u, u->fragment_path); + if (r < 0) return r; if (u->load_state == UNIT_STUB) { @@ -2388,7 +2399,8 @@ int unit_load_fragment(Unit *u) { if (u->load_state == UNIT_STUB && u->instance) { char *k; - if (!(k = unit_name_template(u->id))) + k = unit_name_template(u->id); + if (!k) return -ENOMEM; r = load_from_path(u, k); @@ -2403,7 +2415,8 @@ int unit_load_fragment(Unit *u) { if (t == u->id) continue; - if (!(k = unit_name_template(t))) + k = unit_name_template(t); + if (!k) return -ENOMEM; r = load_from_path(u, k); @@ -2449,11 +2462,9 @@ void unit_dump_config_items(FILE *f) { { config_parse_exec_capabilities, "CAPABILITIES" }, { config_parse_exec_secure_bits, "SECUREBITS" }, { config_parse_bounding_set, "BOUNDINGSET" }, - { config_parse_exec_timer_slack_nsec, "TIMERSLACK" }, { config_parse_limit, "LIMIT" }, { config_parse_unit_cgroup, "CGROUP [...]" }, { config_parse_unit_deps, "UNIT [...]" }, - { config_parse_unit_names, "UNIT [...]" }, { config_parse_exec, "PATH [ARGUMENT [...]]" }, { config_parse_service_type, "SERVICETYPE" }, { config_parse_service_restart, "SERVICERESTART" }, @@ -2468,6 +2479,7 @@ void unit_dump_config_items(FILE *f) { { config_parse_socket_bind, "SOCKETBIND" }, { config_parse_socket_bindtodevice, "NETWORKINTERFACE" }, { config_parse_usec, "SECONDS" }, + { config_parse_nsec, "NANOSECONDS" }, { config_parse_path_strv, "PATH [...]" }, { config_parse_unit_requires_mounts_for, "PATH [...]" }, { config_parse_exec_mount_flags, "MOUNTFLAG [...]" },