X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fexecute.h;h=c9e29ffc8a9a0c730d2f54ddc1cfb869f21a96b0;hp=6c68169a8420cd4fc5e6806bf603ba531b18fb48;hb=4e595329a93ed190795c2e24bf132d5028ec6a72;hpb=d88a251b125f6e9178b9ca9ea47ab7da3234cb58 diff --git a/src/core/execute.h b/src/core/execute.h index 6c68169a8..c9e29ffc8 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef fooexecutehfoo -#define fooexecutehfoo +#pragma once /*** This file is part of systemd. @@ -25,6 +24,7 @@ typedef struct ExecStatus ExecStatus; typedef struct ExecCommand ExecCommand; typedef struct ExecContext ExecContext; +typedef struct ExecRuntime ExecRuntime; #include #include @@ -34,27 +34,11 @@ typedef struct ExecContext ExecContext; #include #include -struct CGroupBonding; -struct CGroupAttribute; - #include "list.h" #include "util.h" - -typedef enum KillMode { - KILL_CONTROL_GROUP = 0, - KILL_PROCESS, - KILL_NONE, - _KILL_MODE_MAX, - _KILL_MODE_INVALID = -1 -} KillMode; - -typedef enum KillWho { - KILL_MAIN, - KILL_CONTROL, - KILL_ALL, - _KILL_WHO_MAX, - _KILL_WHO_INVALID = -1 -} KillWho; +#include "set.h" +#include "fdset.h" +#include "missing.h" typedef enum ExecInput { EXEC_INPUT_NULL, @@ -97,11 +81,20 @@ struct ExecCommand { bool ignore; }; +struct ExecRuntime { + int n_ref; + + char *tmp_dir; + char *var_tmp_dir; + + int netns_storage_socket[2]; +}; + struct ExecContext { char **environment; char **environment_files; - struct rlimit *rlimit[RLIMIT_NLIMITS]; + struct rlimit *rlimit[_RLIMIT_MAX]; char *working_directory, *root_directory; mode_t umask; @@ -120,8 +113,6 @@ struct ExecContext { nsec_t timer_slack_nsec; - char *tcpwrap_name; - char *tty_path; bool tty_reset; @@ -142,16 +133,17 @@ struct ExecContext { char *utmp_id; + bool selinux_context_ignore; + char *selinux_context; + + bool apparmor_profile_ignore; + char *apparmor_profile; + char **read_write_dirs, **read_only_dirs, **inaccessible_dirs; unsigned long mount_flags; uint64_t capability_bounding_set_drop; - /* Not relevant for spawning processes, just for killing */ - KillMode kill_mode; - int kill_signal; - bool send_sigkill; - cap_t capabilities; int secure_bits; @@ -163,9 +155,9 @@ struct ExecContext { bool non_blocking; bool private_tmp; bool private_network; + bool private_devices; - bool control_group_modify; - int control_group_persistent; + bool no_new_privileges; /* This is not exposed to the user but available * internally. We need it to make sure that whenever we spawn @@ -174,25 +166,44 @@ struct ExecContext { * don't enter a trigger loop. */ bool same_pgrp; + unsigned long personality; + + Set *syscall_filter; + Set *syscall_archs; + int syscall_errno; + bool syscall_whitelist:1; + + Set *address_families; + bool address_families_whitelist:1; + + char **runtime_directory; + mode_t runtime_directory_mode; + bool oom_score_adjust_set:1; bool nice_set:1; bool ioprio_set:1; bool cpu_sched_set:1; + bool no_new_privileges_set:1; }; +#include "cgroup.h" + int exec_spawn(ExecCommand *command, char **argv, - const ExecContext *context, + ExecContext *context, int fds[], unsigned n_fds, char **environment, bool apply_permissions, bool apply_chroot, bool apply_tty_stdin, bool confirm_spawn, - struct CGroupBonding *cgroup_bondings, - struct CGroupAttribute *cgroup_attributes, - const char *cgroup_suffix, + CGroupControllerMask cgroup_mask, + const char *cgroup_path, + const char *runtime_prefix, + const char *unit_id, + usec_t watchdog_usec, int pipe_fd[2], + ExecRuntime *runtime, pid_t *ret); void exec_command_done(ExecCommand *c); @@ -211,24 +222,28 @@ int exec_command_set(ExecCommand *c, const char *path, ...); void exec_context_init(ExecContext *c); void exec_context_done(ExecContext *c); void exec_context_dump(ExecContext *c, FILE* f, const char *prefix); -void exec_context_tty_reset(const ExecContext *context); + +int exec_context_destroy_runtime_directory(ExecContext *c, const char *runtime_root); int exec_context_load_environment(const ExecContext *c, char ***l); +bool exec_context_may_touch_console(ExecContext *c); + void exec_status_start(ExecStatus *s, pid_t pid); void exec_status_exit(ExecStatus *s, ExecContext *context, pid_t pid, int code, int status); void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix); -const char* exec_output_to_string(ExecOutput i); -ExecOutput exec_output_from_string(const char *s); +int exec_runtime_make(ExecRuntime **rt, ExecContext *c, const char *id); +ExecRuntime *exec_runtime_ref(ExecRuntime *r); +ExecRuntime *exec_runtime_unref(ExecRuntime *r); -const char* exec_input_to_string(ExecInput i); -ExecInput exec_input_from_string(const char *s); +int exec_runtime_serialize(ExecRuntime *rt, Unit *u, FILE *f, FDSet *fds); +int exec_runtime_deserialize_item(ExecRuntime **rt, Unit *u, const char *key, const char *value, FDSet *fds); -const char *kill_mode_to_string(KillMode k); -KillMode kill_mode_from_string(const char *s); +void exec_runtime_destroy(ExecRuntime *rt); -const char *kill_who_to_string(KillWho k); -KillWho kill_who_from_string(const char *s); +const char* exec_output_to_string(ExecOutput i) _const_; +ExecOutput exec_output_from_string(const char *s) _pure_; -#endif +const char* exec_input_to_string(ExecInput i) _const_; +ExecInput exec_input_from_string(const char *s) _pure_;