summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-06-27 02:28:12 +0200
committerLennart Poettering <lennart@poettering.net>2013-06-27 04:17:33 +0200
commitabb26902e424c4142b68ead35676028b12249b77 (patch)
treed45eef5a89b20066f46b546d5c7f40dc2fb38783
parent5841bd803f1b651c0d70c6ae114630723a76d1da (diff)
core: don't do runaway fork()s if we hit a segfault from our segfault handler
-rw-r--r--src/core/main.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 470fecf15d..c123de91ce 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -106,7 +106,10 @@ static void nop_handler(int sig) {
_noreturn_ static void crash(int sig) {
- if (!arg_dump_core)
+ if (getpid() != 1)
+ /* Pass this on immediately, if this is not PID 1 */
+ raise(sig);
+ else if (!arg_dump_core)
log_error("Caught <%s>, not dumping core.", signal_to_string(sig));
else {
struct sigaction sa = {
@@ -116,7 +119,7 @@ _noreturn_ static void crash(int sig) {
pid_t pid;
/* We want to wait for the core process, hence let's enable SIGCHLD */
- assert_se(sigaction(SIGCHLD, &sa, NULL) == 0);
+ sigaction(SIGCHLD, &sa, NULL);
pid = fork();
if (pid < 0)
@@ -128,7 +131,7 @@ _noreturn_ static void crash(int sig) {
/* Enable default signal handler for core dump */
zero(sa);
sa.sa_handler = SIG_DFL;
- assert_se(sigaction(sig, &sa, NULL) == 0);
+ sigaction(sig, &sa, NULL);
/* Don't limit the core dump size */
rl.rlim_cur = RLIM_INFINITY;
@@ -136,7 +139,7 @@ _noreturn_ static void crash(int sig) {
setrlimit(RLIMIT_CORE, &rl);
/* Just to be sure... */
- assert_se(chdir("/") == 0);
+ chdir("/");
/* Raise the signal again */
raise(sig);