X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fmain.c;h=3c1e04c529036170b6092541541917813ca111e3;hp=fb34e4d3d19982ff286541ea8e4f7d8d298e7657;hb=b6e2f3293d0f9a821819d96038eec2a19062151f;hpb=d8160f21fd295b451cee9679aa281fedf1cb8e8c diff --git a/src/core/main.c b/src/core/main.c index fb34e4d3d..3c1e04c52 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -82,15 +82,13 @@ static enum { ACTION_DUMP_CONFIGURATION_ITEMS, ACTION_DONE } arg_action = ACTION_RUN; - static char *arg_default_unit = NULL; static SystemdRunningAs arg_running_as = _SYSTEMD_RUNNING_AS_INVALID; - static bool arg_dump_core = true; static bool arg_crash_shell = false; static int arg_crash_chvt = -1; static bool arg_confirm_spawn = false; -static bool arg_show_status = true; +static ShowStatus arg_show_status = _SHOW_STATUS_UNSET; static bool arg_switched_root = false; static char ***arg_join_controllers = NULL; static ExecOutput arg_default_std_output = EXEC_OUTPUT_JOURNAL; @@ -106,11 +104,10 @@ static char **arg_default_environment = NULL; static struct rlimit *arg_default_rlimit[RLIMIT_NLIMITS] = {}; static uint64_t arg_capability_bounding_set_drop = 0; static nsec_t arg_timer_slack_nsec = (nsec_t) -1; +static Set* arg_syscall_archs = NULL; +static FILE* arg_serialization = NULL; -static FILE* serialization = NULL; - -static void nop_handler(int sig) { -} +static void nop_handler(int sig) {} noreturn static void crash(int sig) { @@ -306,7 +303,8 @@ static int parse_proc_cmdline_word(const char *word) { } else if (startswith(word, "systemd.dump_core=")) { int r; - if ((r = parse_boolean(word + 18)) < 0) + r = parse_boolean(word + 18); + if (r < 0) log_warning("Failed to parse dump core switch %s. Ignoring.", word + 18); else arg_dump_core = r; @@ -314,7 +312,8 @@ static int parse_proc_cmdline_word(const char *word) { } else if (startswith(word, "systemd.crash_shell=")) { int r; - if ((r = parse_boolean(word + 20)) < 0) + r = parse_boolean(word + 20); + if (r < 0) log_warning("Failed to parse crash shell switch %s. Ignoring.", word + 20); else arg_crash_shell = r; @@ -322,7 +321,8 @@ static int parse_proc_cmdline_word(const char *word) { } else if (startswith(word, "systemd.confirm_spawn=")) { int r; - if ((r = parse_boolean(word + 22)) < 0) + r = parse_boolean(word + 22); + if (r < 0) log_warning("Failed to parse confirm spawn switch %s. Ignoring.", word + 22); else arg_confirm_spawn = r; @@ -338,30 +338,27 @@ static int parse_proc_cmdline_word(const char *word) { } else if (startswith(word, "systemd.show_status=")) { int r; - if ((r = parse_boolean(word + 20)) < 0) + r = parse_show_status(word + 20, &arg_show_status); + if (r < 0) log_warning("Failed to parse show status switch %s. Ignoring.", word + 20); - else - arg_show_status = r; } else if (startswith(word, "systemd.default_standard_output=")) { int r; - if ((r = exec_output_from_string(word + 32)) < 0) + r = exec_output_from_string(word + 32); + if (r < 0) log_warning("Failed to parse default standard output switch %s. Ignoring.", word + 32); else arg_default_std_output = r; } else if (startswith(word, "systemd.default_standard_error=")) { int r; - if ((r = exec_output_from_string(word + 31)) < 0) + r = exec_output_from_string(word + 31); + if (r < 0) log_warning("Failed to parse default standard error switch %s. Ignoring.", word + 31); else arg_default_std_error = r; } else if (startswith(word, "systemd.setenv=")) { - _cleanup_free_ char *cenv = NULL; - - cenv = strdup(word + 15); - if (!cenv) - return -ENOMEM; + const char *cenv = word + 15; if (env_assignment_is_valid(cenv)) { char **env; @@ -370,7 +367,8 @@ static int parse_proc_cmdline_word(const char *word) { if (env) arg_default_environment = env; else - log_warning("Setting environment variable '%s' failed, ignoring: %m", cenv); + log_warning("Setting environment variable '%s' failed, ignoring: %s", + cenv, strerror(ENOMEM)); } else log_warning("Environment variable name '%s' is not valid. Ignoring.", cenv); @@ -396,7 +394,7 @@ static int parse_proc_cmdline_word(const char *word) { "systemd.crash_shell=0|1 Run shell on crash\n" "systemd.crash_chvt=N Change to VT #N on crash\n" "systemd.confirm_spawn=0|1 Confirm every process spawn\n" - "systemd.show_status=0|1 Show status updates on the console during bootup\n" + "systemd.show_status=0|1|auto Show status updates on the console during bootup\n" "systemd.log_target=console|kmsg|journal|journal-or-kmsg|syslog|syslog-or-kmsg|null\n" " Log target\n" "systemd.log_level=LEVEL Log level\n" @@ -409,9 +407,10 @@ static int parse_proc_cmdline_word(const char *word) { "systemd.setenv=ASSIGNMENT Set an environment variable for all spawned processes\n"); } - } else if (streq(word, "quiet")) - arg_show_status = false; - else if (streq(word, "debug")) { + } else if (streq(word, "quiet")) { + if (arg_show_status == _SHOW_STATUS_UNSET) + arg_show_status = SHOW_STATUS_AUTO; + } else if (streq(word, "debug")) { /* Log to kmsg, the journal socket will fill up before the * journal is started and tools running during that time * will block with every log message for for 60 seconds, @@ -632,45 +631,48 @@ static int config_parse_join_controllers(const char *unit, static int parse_config_file(void) { const ConfigTableItem items[] = { - { "Manager", "LogLevel", config_parse_level2, 0, NULL }, - { "Manager", "LogTarget", config_parse_target, 0, NULL }, - { "Manager", "LogColor", config_parse_color, 0, NULL }, - { "Manager", "LogLocation", config_parse_location, 0, NULL }, - { "Manager", "DumpCore", config_parse_bool, 0, &arg_dump_core }, - { "Manager", "CrashShell", config_parse_bool, 0, &arg_crash_shell }, - { "Manager", "ShowStatus", config_parse_bool, 0, &arg_show_status }, - { "Manager", "CrashChVT", config_parse_int, 0, &arg_crash_chvt }, - { "Manager", "CPUAffinity", config_parse_cpu_affinity2, 0, NULL }, - { "Manager", "DefaultStandardOutput", config_parse_output, 0, &arg_default_std_output }, - { "Manager", "DefaultStandardError", config_parse_output, 0, &arg_default_std_error }, - { "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec }, - { "Manager", "DefaultTimeoutStopSec", config_parse_sec, 0, &arg_default_timeout_stop_usec }, - { "Manager", "DefaultRestartSec", config_parse_sec, 0, &arg_default_restart_usec }, - { "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval }, - { "Manager", "DefaultStartLimitBurst", config_parse_unsigned, 0, &arg_default_start_limit_burst }, - { "Manager", "JoinControllers", config_parse_join_controllers, 0, &arg_join_controllers }, - { "Manager", "RuntimeWatchdogSec", config_parse_sec, 0, &arg_runtime_watchdog }, - { "Manager", "ShutdownWatchdogSec", config_parse_sec, 0, &arg_shutdown_watchdog }, - { "Manager", "CapabilityBoundingSet", config_parse_bounding_set, 0, &arg_capability_bounding_set_drop }, - { "Manager", "TimerSlackNSec", config_parse_nsec, 0, &arg_timer_slack_nsec }, - { "Manager", "DefaultEnvironment", config_parse_environ, 0, &arg_default_environment }, - { "Manager", "DefaultLimitCPU", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_CPU]}, - { "Manager", "DefaultLimitFSIZE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_FSIZE]}, - { "Manager", "DefaultLimitDATA", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_DATA]}, - { "Manager", "DefaultLimitSTACK", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_STACK]}, - { "Manager", "DefaultLimitCORE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_CORE]}, - { "Manager", "DefaultLimitRSS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RSS]}, - { "Manager", "DefaultLimitNOFILE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NOFILE]}, - { "Manager", "DefaultLimitAS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_AS]}, - { "Manager", "DefaultLimitNPROC", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NPROC]}, - { "Manager", "DefaultLimitMEMLOCK", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_MEMLOCK]}, - { "Manager", "DefaultLimitLOCKS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_LOCKS]}, - { "Manager", "DefaultLimitSIGPENDING",config_parse_limit, 0, &arg_default_rlimit[RLIMIT_SIGPENDING]}, - { "Manager", "DefaultLimitMSGQUEUE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_MSGQUEUE]}, - { "Manager", "DefaultLimitNICE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NICE]}, - { "Manager", "DefaultLimitRTPRIO", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RTPRIO]}, - { "Manager", "DefaultLimitRTTIME", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RTTIME]}, - { NULL, NULL, NULL, 0, NULL } + { "Manager", "LogLevel", config_parse_level2, 0, NULL }, + { "Manager", "LogTarget", config_parse_target, 0, NULL }, + { "Manager", "LogColor", config_parse_color, 0, NULL }, + { "Manager", "LogLocation", config_parse_location, 0, NULL }, + { "Manager", "DumpCore", config_parse_bool, 0, &arg_dump_core }, + { "Manager", "CrashShell", config_parse_bool, 0, &arg_crash_shell }, + { "Manager", "ShowStatus", config_parse_show_status, 0, &arg_show_status }, + { "Manager", "CrashChVT", config_parse_int, 0, &arg_crash_chvt }, + { "Manager", "CPUAffinity", config_parse_cpu_affinity2, 0, NULL }, + { "Manager", "JoinControllers", config_parse_join_controllers, 0, &arg_join_controllers }, + { "Manager", "RuntimeWatchdogSec", config_parse_sec, 0, &arg_runtime_watchdog }, + { "Manager", "ShutdownWatchdogSec", config_parse_sec, 0, &arg_shutdown_watchdog }, + { "Manager", "CapabilityBoundingSet", config_parse_bounding_set, 0, &arg_capability_bounding_set_drop }, +#ifdef HAVE_SECCOMP + { "Manager", "SystemCallArchitectures", config_parse_syscall_archs, 0, &arg_syscall_archs }, +#endif + { "Manager", "TimerSlackNSec", config_parse_nsec, 0, &arg_timer_slack_nsec }, + { "Manager", "DefaultStandardOutput", config_parse_output, 0, &arg_default_std_output }, + { "Manager", "DefaultStandardError", config_parse_output, 0, &arg_default_std_error }, + { "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec }, + { "Manager", "DefaultTimeoutStopSec", config_parse_sec, 0, &arg_default_timeout_stop_usec }, + { "Manager", "DefaultRestartSec", config_parse_sec, 0, &arg_default_restart_usec }, + { "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval }, + { "Manager", "DefaultStartLimitBurst", config_parse_unsigned, 0, &arg_default_start_limit_burst }, + { "Manager", "DefaultEnvironment", config_parse_environ, 0, &arg_default_environment }, + { "Manager", "DefaultLimitCPU", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_CPU] }, + { "Manager", "DefaultLimitFSIZE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_FSIZE] }, + { "Manager", "DefaultLimitDATA", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_DATA] }, + { "Manager", "DefaultLimitSTACK", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_STACK] }, + { "Manager", "DefaultLimitCORE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_CORE] }, + { "Manager", "DefaultLimitRSS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RSS] }, + { "Manager", "DefaultLimitNOFILE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NOFILE] }, + { "Manager", "DefaultLimitAS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_AS] }, + { "Manager", "DefaultLimitNPROC", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NPROC] }, + { "Manager", "DefaultLimitMEMLOCK", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_MEMLOCK] }, + { "Manager", "DefaultLimitLOCKS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_LOCKS] }, + { "Manager", "DefaultLimitSIGPENDING", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_SIGPENDING] }, + { "Manager", "DefaultLimitMSGQUEUE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_MSGQUEUE] }, + { "Manager", "DefaultLimitNICE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NICE] }, + { "Manager", "DefaultLimitRTPRIO", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RTPRIO] }, + { "Manager", "DefaultLimitRTTIME", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RTTIME] }, + {} }; _cleanup_fclose_ FILE *f; @@ -694,35 +696,6 @@ static int parse_config_file(void) { return 0; } -static int parse_proc_cmdline(void) { - _cleanup_free_ char *line = NULL; - char *w, *state; - size_t l; - int r; - - r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - if (r <= 0) - return 0; - - FOREACH_WORD_QUOTED(w, l, line, state) { - _cleanup_free_ char *word; - - word = strndup(w, l); - if (!word) - return log_oom(); - - r = parse_proc_cmdline_word(word); - if (r < 0) { - log_error("Failed on cmdline argument %s: %s", word, strerror(-r)); - return r; - } - } - - return 0; -} - static int parse_argv(int argc, char *argv[]) { enum { @@ -766,7 +739,7 @@ static int parse_argv(int argc, char *argv[]) { { "switched-root", no_argument, NULL, ARG_SWITCHED_ROOT }, { "default-standard-output", required_argument, NULL, ARG_DEFAULT_STD_OUTPUT, }, { "default-standard-error", required_argument, NULL, ARG_DEFAULT_STD_ERROR, }, - { NULL, 0, NULL, 0 } + {} }; int c, r; @@ -782,7 +755,8 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case ARG_LOG_LEVEL: - if ((r = log_set_max_level_from_string(optarg)) < 0) { + r = log_set_max_level_from_string(optarg); + if (r < 0) { log_error("Failed to parse log level %s.", optarg); return r; } @@ -790,8 +764,8 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_LOG_TARGET: - - if ((r = log_set_target_from_string(optarg)) < 0) { + r = log_set_target_from_string(optarg); + if (r < 0) { log_error("Failed to parse log target %s.", optarg); return r; } @@ -801,7 +775,8 @@ static int parse_argv(int argc, char *argv[]) { case ARG_LOG_COLOR: if (optarg) { - if ((r = log_show_color_from_string(optarg)) < 0) { + r = log_show_color_from_string(optarg); + if (r < 0) { log_error("Failed to parse log color setting %s.", optarg); return r; } @@ -811,9 +786,9 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_LOG_LOCATION: - if (optarg) { - if ((r = log_show_location_from_string(optarg)) < 0) { + r = log_show_location_from_string(optarg); + if (r < 0) { log_error("Failed to parse log location setting %s.", optarg); return r; } @@ -823,8 +798,8 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_DEFAULT_STD_OUTPUT: - - if ((r = exec_output_from_string(optarg)) < 0) { + r = exec_output_from_string(optarg); + if (r < 0) { log_error("Failed to parse default standard output setting %s.", optarg); return r; } else @@ -832,8 +807,8 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_DEFAULT_STD_ERROR: - - if ((r = exec_output_from_string(optarg)) < 0) { + r = exec_output_from_string(optarg); + if (r < 0) { log_error("Failed to parse default standard error output setting %s.", optarg); return r; } else @@ -842,7 +817,8 @@ static int parse_argv(int argc, char *argv[]) { case ARG_UNIT: - if ((r = set_default_unit(optarg)) < 0) { + r = set_default_unit(optarg); + if (r < 0) { log_error("Failed to set default unit %s: %s", optarg, strerror(-r)); return r; } @@ -897,12 +873,14 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_SHOW_STATUS: - r = optarg ? parse_boolean(optarg) : 1; - if (r < 0) { - log_error("Failed to parse show status boolean %s.", optarg); - return r; - } - arg_show_status = r; + if (optarg) { + r = parse_show_status(optarg, &arg_show_status); + if (r < 0) { + log_error("Failed to parse show status boolean %s.", optarg); + return r; + } + } else + arg_show_status = SHOW_STATUS_YES; break; case ARG_DESERIALIZE: { @@ -923,10 +901,10 @@ static int parse_argv(int argc, char *argv[]) { return -errno; } - if (serialization) - fclose(serialization); + if (arg_serialization) + fclose(arg_serialization); - serialization = f; + arg_serialization = f; break; } @@ -1192,6 +1170,63 @@ static int initialize_join_controllers(void) { return 0; } +static int enforce_syscall_archs(Set *archs) { +#ifdef HAVE_SECCOMP + scmp_filter_ctx *seccomp; + Iterator i; + void *id; + int r; + + seccomp = seccomp_init(SCMP_ACT_ALLOW); + if (!seccomp) + return log_oom(); + + SET_FOREACH(id, arg_syscall_archs, i) { + r = seccomp_arch_add(seccomp, PTR_TO_UINT32(id) - 1); + if (r == -EEXIST) + continue; + if (r < 0) { + log_error("Failed to add architecture to seccomp: %s", strerror(-r)); + goto finish; + } + } + + r = seccomp_attr_set(seccomp, SCMP_FLTATR_CTL_NNP, 0); + if (r < 0) { + log_error("Failed to unset NO_NEW_PRIVS: %s", strerror(-r)); + goto finish; + } + + r = seccomp_load(seccomp); + if (r < 0) + log_error("Failed to add install architecture seccomp: %s", strerror(-r)); + +finish: + seccomp_release(seccomp); + return r; +#else + return 0; +#endif +} + +static int status_welcome(void) { + _cleanup_free_ char *pretty_name = NULL, *ansi_color = NULL; + int r; + + r = parse_env_file("/etc/os-release", NEWLINE, + "PRETTY_NAME", &pretty_name, + "ANSI_COLOR", &ansi_color, + NULL); + + if (r < 0 && r != -ENOENT) + log_warning("Failed to read /etc/os-release: %s", strerror(-r)); + + return status_printf(NULL, false, false, + "\nWelcome to \x1B[%sm%s\x1B[0m!\n", + isempty(ansi_color) ? "1" : ansi_color, + isempty(pretty_name) ? "Linux" : pretty_name); +} + int main(int argc, char *argv[]) { Manager *m = NULL; int r, retval = EXIT_FAILURE; @@ -1207,7 +1242,7 @@ int main(int argc, char *argv[]) { dual_timestamp security_finish_timestamp = { 0ULL, 0ULL }; static char systemd[] = "systemd"; bool skip_setup = false; - int j; + unsigned j; bool loaded_policy = false; bool arm_reboot_watchdog = false; bool queue_default_job = false; @@ -1373,7 +1408,7 @@ int main(int argc, char *argv[]) { goto finish; if (arg_running_as == SYSTEMD_SYSTEM) - if (parse_proc_cmdline() < 0) + if (parse_proc_cmdline(parse_proc_cmdline_word) < 0) goto finish; log_parse_environment(); @@ -1435,8 +1470,8 @@ int main(int argc, char *argv[]) { } else fdset_cloexec(fds, true); - if (serialization) - assert_se(fdset_remove(fds, fileno(serialization)) >= 0); + if (arg_serialization) + assert_se(fdset_remove(fds, fileno(arg_serialization)) >= 0); if (arg_running_as == SYSTEMD_SYSTEM) /* Become a session leader if we aren't one yet. */ @@ -1453,6 +1488,9 @@ int main(int argc, char *argv[]) { /* Open the logging devices, if possible and necessary */ log_open(); + if (arg_show_status == _SHOW_STATUS_UNSET) + arg_show_status = SHOW_STATUS_YES; + /* Make sure we leave a core dump without panicing the * kernel. */ if (getpid() == 1) { @@ -1482,7 +1520,7 @@ int main(int argc, char *argv[]) { } if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) { - if (arg_show_status || plymouth_running()) + if (arg_show_status > 0 || plymouth_running()) status_welcome(); #ifdef HAVE_KMOD @@ -1518,6 +1556,12 @@ int main(int argc, char *argv[]) { } } + if (arg_syscall_archs) { + r = enforce_syscall_archs(arg_syscall_archs); + if (r < 0) + goto finish; + } + if (arg_running_as == SYSTEMD_USER) { /* Become reaper of our children */ if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0) { @@ -1553,18 +1597,15 @@ int main(int argc, char *argv[]) { m->security_finish_timestamp = security_finish_timestamp; manager_set_default_rlimits(m, arg_default_rlimit); - - if (arg_default_environment) - manager_environment_add(m, NULL, arg_default_environment); - + manager_environment_add(m, NULL, arg_default_environment); manager_set_show_status(m, arg_show_status); /* Remember whether we should queue the default job */ - queue_default_job = !serialization || arg_switched_root; + queue_default_job = !arg_serialization || arg_switched_root; before_startup = now(CLOCK_MONOTONIC); - r = manager_startup(m, serialization, fds); + r = manager_startup(m, arg_serialization, fds); if (r < 0) log_error("Failed to fully start up daemon: %s", strerror(-r)); @@ -1573,9 +1614,9 @@ int main(int argc, char *argv[]) { fdset_free(fds); fds = NULL; - if (serialization) { - fclose(serialization); - serialization = NULL; + if (arg_serialization) { + fclose(arg_serialization); + arg_serialization = NULL; } if (queue_default_job) { @@ -1668,7 +1709,7 @@ int main(int argc, char *argv[]) { case MANAGER_REEXECUTE: - if (prepare_reexecute(m, &serialization, &fds, false) < 0) + if (prepare_reexecute(m, &arg_serialization, &fds, false) < 0) goto finish; reexecute = true; @@ -1682,7 +1723,7 @@ int main(int argc, char *argv[]) { m->switch_root = m->switch_root_init = NULL; if (!switch_root_init) - if (prepare_reexecute(m, &serialization, &fds, true) < 0) + if (prepare_reexecute(m, &arg_serialization, &fds, true) < 0) goto finish; reexecute = true; @@ -1713,15 +1754,27 @@ int main(int argc, char *argv[]) { } finish: - if (m) + if (m) { manager_free(m); + m = NULL; + } - for (j = 0; j < RLIMIT_NLIMITS; j++) + for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) { free(arg_default_rlimit[j]); + arg_default_rlimit[j] = NULL; + } free(arg_default_unit); + arg_default_unit = NULL; + free_join_controllers(); + strv_free(arg_default_environment); + arg_default_environment = NULL; + + set_free(arg_syscall_archs); + arg_syscall_archs = NULL; + label_finish(); if (reexecute) { @@ -1763,10 +1816,10 @@ finish: * this only if the user didn't specify an * explicit init to spawn. */ - assert(serialization); + assert(arg_serialization); assert(fds); - snprintf(sfd, sizeof(sfd), "%i", fileno(serialization)); + snprintf(sfd, sizeof(sfd), "%i", fileno(arg_serialization)); char_array_0(sfd); i = 0; @@ -1792,9 +1845,9 @@ finish: * getopt() in argv[], and some cleanups in envp[], * but let's hope that doesn't matter.) */ - if (serialization) { - fclose(serialization); - serialization = NULL; + if (arg_serialization) { + fclose(arg_serialization); + arg_serialization = NULL; } if (fds) { @@ -1805,7 +1858,7 @@ finish: /* Reopen the console */ make_console_stdio(); - for (j = 1, i = 1; j < argc; j++) + for (j = 1, i = 1; j < (unsigned) argc; j++) args[i++] = argv[j]; args[i++] = NULL; assert(i <= args_size); @@ -1830,11 +1883,15 @@ finish: log_warning("Failed to execute /sbin/init, giving up: %m"); } - if (serialization) - fclose(serialization); + if (arg_serialization) { + fclose(arg_serialization); + arg_serialization = NULL; + } - if (fds) + if (fds) { fdset_free(fds); + fds = NULL; + } #ifdef HAVE_VALGRIND_VALGRIND_H /* If we are PID 1 and running under valgrind, then let's exit @@ -1846,14 +1903,42 @@ finish: #endif if (shutdown_verb) { - const char * command_line[] = { + char log_level[DECIMAL_STR_MAX(int) + 1]; + const char* command_line[9] = { SYSTEMD_SHUTDOWN_BINARY_PATH, shutdown_verb, - NULL + "--log-level", log_level, + "--log-target", }; + unsigned pos = 5; + assert(command_line[pos] == NULL); + _cleanup_strv_free_ char **env_block = NULL; env_block = strv_copy(environ); + snprintf(log_level, sizeof(log_level), "%d", log_get_max_level()); + + switch (log_get_target()) { + case LOG_TARGET_KMSG: + case LOG_TARGET_JOURNAL_OR_KMSG: + case LOG_TARGET_SYSLOG_OR_KMSG: + command_line[pos++] = "kmsg"; + break; + + case LOG_TARGET_CONSOLE: + default: + command_line[pos++] = "console"; + break; + }; + + if (log_get_show_color()) + command_line[pos++] = "--log-color"; + + if (log_get_show_location()) + command_line[pos++] = "--log-location"; + + assert(pos + 1 < ELEMENTSOF(command_line)); + if (arm_reboot_watchdog && arg_shutdown_watchdog > 0) { char *e; @@ -1876,7 +1961,8 @@ finish: cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER); execve(SYSTEMD_SHUTDOWN_BINARY_PATH, (char **) command_line, env_block); - log_error("Failed to execute shutdown binary, freezing: %m"); + log_error("Failed to execute shutdown binary, %s: %m", + getpid() == 1 ? "freezing" : "quitting"); } if (getpid() == 1)