shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 16:59:03 +03:00
Code

Merge pull request #7836 from jkloetzke/shutdown-no-coredumps

Browse Source 
shutdown: prevent core dumps in final shutdown stage
This commit is contained in:
Lennart Poettering 2018-01-10 15:15:07 +01:00 committed by GitHub
commit 4631116dd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/basic/util.c
View File

@ -61,6 +61,7 @@
#include "umask-util.h"
#include "user-util.h"
#include "util.h"
#include "virt.h"
int saved_argc = 0;
char **saved_argv = NULL;
@ -615,3 +616,9 @@ int str_verscmp(const char *s1, const char *s2) {
return strcmp(os1, os2);
}
/* Turn off core dumps but only if we're running outside of a container. */
void disable_core_dumps(void) {
if (detect_container() <= 0)
(void) write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0);
}

2
src/basic/util.h
View File

@ -191,3 +191,5 @@ int update_reboot_parameter_and_warn(const char *param);
int version(void);
int str_verscmp(const char *s1, const char *s2);
void disable_core_dumps(void);

3
src/core/main.c
View File

@ -91,6 +91,7 @@
#include "terminal-util.h"
#include "umask-util.h"
#include "user-util.h"
#include "util.h"
#include "virt.h"
#include "watchdog.h"
@ -1603,7 +1604,7 @@ static void initialize_coredump(bool skip_setup) {
/* But at the same time, turn off the core_pattern logic by default, so that no coredumps are stored
* until the systemd-coredump tool is enabled via sysctl. */
if (!skip_setup)
(void) write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0);
disable_core_dumps();
}
static void do_reexecute(

3
src/core/shutdown.c
View File

@ -323,6 +323,9 @@ int main(int argc, char *argv[]) {
if (!in_container)
sync_with_progress();
/* Prevent coredumps */
disable_core_dumps();
log_info("Sending SIGTERM to remaining processes...");
broadcast_signal(SIGTERM, true, true);

2
src/coredump/coredump.c
View File

@ -1126,7 +1126,7 @@ static int gather_pid_metadata(
/* If this is PID 1 disable coredump collection, we'll unlikely be able to process it later on. */
if (is_pid1_crash((const char**) context)) {
log_notice("Due to PID 1 having crashed coredump collection will now be turned off.");
(void) write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0);
disable_core_dumps();
}
set_iovec_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]);