shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

coredump: make sure to handle crashes of PID 1 and journald special

Browse Source 
Fixes: #3285
This commit is contained in:
Lennart Poettering 2016-07-22 16:45:43 +02:00
parent 5052c4eadd
commit 78f043f77b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/coredump/coredump.c
View File

@ -756,7 +756,6 @@ static int process_socket(int fd) {
iovec[n_iovec].iov_len = l;
iovec[n_iovec].iov_base = malloc(l + 1);
if (!iovec[n_iovec].iov_base) {
r = log_oom();
goto finish;
@ -897,7 +896,7 @@ static int send_iovec(const struct iovec iovec[], size_t n_iovec, int input_fd)
return 0;
}
static int process_journald_crash(const char *context[], int input_fd) {
static int process_special_crash(const char *context[], int input_fd) {
_cleanup_close_ int coredump_fd = -1, coredump_node_fd = -1;
_cleanup_free_ char *filename = NULL;
uint64_t coredump_size;
@ -906,7 +905,7 @@ static int process_journald_crash(const char *context[], int input_fd) {
assert(context);
assert(input_fd >= 0);
/* If we are journald, we cut things short, don't write to the journal, but still create a coredump. */
/* If we are pid1 or journald, we cut things short, don't write to the journal, but still create a coredump. */
if (arg_storage != COREDUMP_STORAGE_NONE)
arg_storage = COREDUMP_STORAGE_EXTERNAL;
@ -919,7 +918,8 @@ static int process_journald_crash(const char *context[], int input_fd) {
if (r < 0)
return r;
log_info("Detected coredump of the journal daemon itself, diverted to %s.", filename);
log_notice("Detected coredump of the journal daemon or PID 1, diverted to %s.", filename);
return 0;
}
@ -979,9 +979,11 @@ static int process_kernel(int argc, char* argv[]) {
if (cg_pid_get_unit(pid, &t) >= 0) {
if (streq(t, SPECIAL_JOURNALD_SERVICE)) {
/* Let's avoid dead-locks when processing journald and init crashes, as socket activation and logging
* are unlikely to work then. */
if (STR_IN_SET(t, SPECIAL_JOURNALD_SERVICE, SPECIAL_INIT_SCOPE)) {
free(t);
return process_journald_crash(context, STDIN_FILENO);
return process_special_crash(context, STDIN_FILENO);
}
core_unit = strjoina("COREDUMP_UNIT=", t);