mirror of
https://github.com/systemd/systemd.git
synced 2024-11-02 10:51:20 +03:00
Move freeze() into shared/
Library code should not call freeze(), this is something that should only be done by "application code", so moving it into shared/ is appropriate. The fallback to call _exit() is dropped: let's trust that the infinite loop is infinite.
This commit is contained in:
parent
3e24e8cd64
commit
45a68ed307
@ -1037,30 +1037,6 @@ bool is_main_thread(void) {
|
|||||||
return cached > 0;
|
return cached > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
_noreturn_ void freeze(void) {
|
|
||||||
|
|
||||||
log_close();
|
|
||||||
|
|
||||||
/* Make sure nobody waits for us on a socket anymore */
|
|
||||||
(void) close_all_fds(NULL, 0);
|
|
||||||
|
|
||||||
sync();
|
|
||||||
|
|
||||||
/* Let's not freeze right away, but keep reaping zombies. */
|
|
||||||
for (;;) {
|
|
||||||
int r;
|
|
||||||
siginfo_t si = {};
|
|
||||||
|
|
||||||
r = waitid(P_ALL, 0, &si, WEXITED);
|
|
||||||
if (r < 0 && errno != EINTR)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* waitid() failed with an unexpected error, things are really borked. Freeze now! */
|
|
||||||
for (;;)
|
|
||||||
pause();
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned long personality_from_string(const char *p) {
|
unsigned long personality_from_string(const char *p) {
|
||||||
int architecture;
|
int architecture;
|
||||||
|
|
||||||
|
@ -82,8 +82,6 @@ int pid_from_same_root_fs(pid_t pid);
|
|||||||
|
|
||||||
bool is_main_thread(void);
|
bool is_main_thread(void);
|
||||||
|
|
||||||
_noreturn_ void freeze(void);
|
|
||||||
|
|
||||||
#ifndef PERSONALITY_INVALID
|
#ifndef PERSONALITY_INVALID
|
||||||
/* personality(7) documents that 0xffffffffUL is used for querying the
|
/* personality(7) documents that 0xffffffffUL is used for querying the
|
||||||
* current personality, hence let's use that here as error
|
* current personality, hence let's use that here as error
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
#include "sd-event.h"
|
#include "sd-event.h"
|
||||||
|
|
||||||
#include "alloc-util.h"
|
#include "alloc-util.h"
|
||||||
|
#include "exec-util.h"
|
||||||
#include "fd-util.h"
|
#include "fd-util.h"
|
||||||
#include "fs-util.h"
|
#include "fs-util.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
@ -448,6 +448,29 @@ ExecCommandFlags exec_command_flags_from_string(const char *s) {
|
|||||||
return 1 << idx;
|
return 1 << idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_noreturn_ void freeze(void) {
|
||||||
|
log_close();
|
||||||
|
|
||||||
|
/* Make sure nobody waits for us on a socket anymore */
|
||||||
|
(void) close_all_fds(NULL, 0);
|
||||||
|
|
||||||
|
sync();
|
||||||
|
|
||||||
|
/* Let's not freeze right away, but keep reaping zombies. */
|
||||||
|
for (;;) {
|
||||||
|
int r;
|
||||||
|
siginfo_t si = {};
|
||||||
|
|
||||||
|
r = waitid(P_ALL, 0, &si, WEXITED);
|
||||||
|
if (r < 0 && errno != EINTR)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* waitid() failed with an unexpected error, things are really borked. Freeze now! */
|
||||||
|
for (;;)
|
||||||
|
pause();
|
||||||
|
}
|
||||||
|
|
||||||
int fexecve_or_execve(int executable_fd, const char *executable, char *const argv[], char *const envp[]) {
|
int fexecve_or_execve(int executable_fd, const char *executable, char *const argv[], char *const envp[]) {
|
||||||
#if ENABLE_FEXECVE
|
#if ENABLE_FEXECVE
|
||||||
execveat(executable_fd, "", argv, envp, AT_EMPTY_PATH);
|
execveat(executable_fd, "", argv, envp, AT_EMPTY_PATH);
|
||||||
|
@ -47,6 +47,8 @@ extern const gather_stdout_callback_t gather_environment[_STDOUT_CONSUME_MAX];
|
|||||||
const char* exec_command_flags_to_string(ExecCommandFlags i);
|
const char* exec_command_flags_to_string(ExecCommandFlags i);
|
||||||
ExecCommandFlags exec_command_flags_from_string(const char *s);
|
ExecCommandFlags exec_command_flags_from_string(const char *s);
|
||||||
|
|
||||||
|
_noreturn_ void freeze(void);
|
||||||
|
|
||||||
int fexecve_or_execve(int executable_fd, const char *executable, char *const argv[], char *const envp[]);
|
int fexecve_or_execve(int executable_fd, const char *executable, char *const argv[], char *const envp[]);
|
||||||
|
|
||||||
int fork_agent(const char *name, int except[], size_t n_except, pid_t *ret_pid, const char *path, ...) _sentinel_;
|
int fork_agent(const char *name, int except[], size_t n_except, pid_t *ret_pid, const char *path, ...) _sentinel_;
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
#include "alloc-util.h"
|
#include "alloc-util.h"
|
||||||
#include "dissect-image.h"
|
#include "dissect-image.h"
|
||||||
|
#include "exec-util.h"
|
||||||
#include "extract-word.h"
|
#include "extract-word.h"
|
||||||
#include "fd-util.h"
|
#include "fd-util.h"
|
||||||
#include "fileio.h"
|
#include "fileio.h"
|
||||||
@ -1010,11 +1011,9 @@ static int make_userns(uid_t uid_shift, uid_t uid_range) {
|
|||||||
r = safe_fork("(sd-mkuserns)", FORK_CLOSE_ALL_FDS|FORK_DEATHSIG|FORK_NEW_USERNS, &pid);
|
r = safe_fork("(sd-mkuserns)", FORK_CLOSE_ALL_FDS|FORK_DEATHSIG|FORK_NEW_USERNS, &pid);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
if (r == 0) {
|
if (r == 0)
|
||||||
/* Child. We do nothing here, just freeze until somebody kills us. */
|
/* Child. We do nothing here, just freeze until somebody kills us. */
|
||||||
freeze();
|
freeze();
|
||||||
_exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, uid_shift, uid_range);
|
xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, uid_shift, uid_range);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user