#include <stdio.h>
#include <sys/prctl.h>
#include <sys/types.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
#include <systemd/sd-journal.h>
#include <systemd/sd-login.h>
#include "log.h"
#include "util.h"
+#include "strv.h"
#include "macro.h"
#include "mkdir.h"
#include "special.h"
#include "journald-native.h"
#include "conf-parser.h"
#include "copy.h"
+#include "stacktrace.h"
+#include "path-util.h"
#ifdef HAVE_ACL
#include <sys/acl.h>
assert_cc(JOURNAL_SIZE_MAX <= ENTRY_SIZE_MAX);
enum {
- ARG_PID = 1,
- ARG_UID,
- ARG_GID,
- ARG_SIGNAL,
- ARG_TIMESTAMP,
- ARG_COMM,
- _ARG_MAX
+ INFO_PID,
+ INFO_UID,
+ INFO_GID,
+ INFO_SIGNAL,
+ INFO_TIMESTAMP,
+ INFO_COMM,
+ INFO_EXE,
+ _INFO_LEN
};
typedef enum CoredumpStorage {
return 0;
}
-static int fix_xattr(int fd, char *argv[]) {
- int r = 0;
+static int fix_xattr(int fd, const char *info[_INFO_LEN]) {
- /* Attach some metadate to coredumps via extended
- * attributes. Just because we can. */
+ static const char * const xattrs[_INFO_LEN] = {
+ [INFO_PID] = "user.coredump.pid",
+ [INFO_UID] = "user.coredump.uid",
+ [INFO_GID] = "user.coredump.gid",
+ [INFO_SIGNAL] = "user.coredump.signal",
+ [INFO_TIMESTAMP] = "user.coredump.timestamp",
+ [INFO_COMM] = "user.coredump.comm",
+ [INFO_EXE] = "user.coredump.exe",
+ };
- if (!isempty(argv[ARG_PID]))
- if (fsetxattr(fd, "user.coredump.pid", argv[ARG_PID], strlen(argv[ARG_PID]), XATTR_CREATE) < 0)
- r = -errno;
+ int r = 0;
+ unsigned i;
- if (!isempty(argv[ARG_UID]))
- if (fsetxattr(fd, "user.coredump.uid", argv[ARG_UID], strlen(argv[ARG_UID]), XATTR_CREATE) < 0)
- r = -errno;
+ /* Attach some metadata to coredumps via extended
+ * attributes. Just because we can. */
- if (!isempty(argv[ARG_GID]))
- if (fsetxattr(fd, "user.coredump.gid", argv[ARG_GID], strlen(argv[ARG_GID]), XATTR_CREATE) < 0)
- r = -errno;
+ for (i = 0; i < _INFO_LEN; i++) {
+ int k;
- if (!isempty(argv[ARG_SIGNAL]))
- if (fsetxattr(fd, "user.coredump.signal", argv[ARG_SIGNAL], strlen(argv[ARG_SIGNAL]), XATTR_CREATE) < 0)
- r = -errno;
+ if (isempty(info[i]) || !xattrs[i])
+ continue;
- if (!isempty(argv[ARG_TIMESTAMP]))
- if (fsetxattr(fd, "user.coredump.timestamp", argv[ARG_TIMESTAMP], strlen(argv[ARG_TIMESTAMP]), XATTR_CREATE) < 0)
- r = -errno;
-
- if (!isempty(argv[ARG_COMM]))
- if (fsetxattr(fd, "user.coredump.comm", argv[ARG_COMM], strlen(argv[ARG_COMM]), XATTR_CREATE) < 0)
+ k = fsetxattr(fd, xattrs[i], info[i], strlen(info[i]), XATTR_CREATE);
+ if (k < 0 && r == 0)
r = -errno;
+ }
return r;
}
-#define filename_escape(s) xescape((s), "./")
+#define filename_escape(s) xescape((s), "./ ")
+
+static int save_external_coredump(const char *info[_INFO_LEN],
+ uid_t uid,
+ char **ret_filename,
+ int *ret_fd,
+ off_t *ret_size) {
-static int save_external_coredump(char **argv, uid_t uid, char **ret_filename, int *ret_fd, off_t *ret_size) {
_cleanup_free_ char *p = NULL, *t = NULL, *c = NULL, *fn = NULL, *tmp = NULL;
_cleanup_close_ int fd = -1;
sd_id128_t boot;
struct stat st;
int r;
- assert(argv);
+ assert(info);
assert(ret_filename);
assert(ret_fd);
assert(ret_size);
- c = filename_escape(argv[ARG_COMM]);
+ c = filename_escape(info[INFO_COMM]);
if (!c)
return log_oom();
- p = filename_escape(argv[ARG_PID]);
+ p = filename_escape(info[INFO_PID]);
if (!p)
return log_oom();
- t = filename_escape(argv[ARG_TIMESTAMP]);
+ t = filename_escape(info[INFO_TIMESTAMP]);
if (!t)
return log_oom();
return -errno;
}
- r = copy_bytes(STDIN_FILENO, fd);
- if (r < 0) {
+ r = copy_bytes(STDIN_FILENO, fd, arg_process_size_max);
+ if (r == -E2BIG) {
+ log_error("Coredump of %s (%s) is larger than configured processing limit, refusing.",
+ info[INFO_PID], info[INFO_COMM]);
+ goto fail;
+ } else if (IN_SET(r, -EDQUOT, -ENOSPC)) {
+ log_error("Not enough disk space for coredump of %s (%s), refusing.",
+ info[INFO_PID], info[INFO_COMM]);
+ goto fail;
+ } else if (r < 0) {
log_error("Failed to dump coredump to file: %s", strerror(-r));
goto fail;
}
/* Ignore errors on these */
fchmod(fd, 0640);
fix_acl(fd, uid);
- fix_xattr(fd, argv);
+ fix_xattr(fd, info);
if (fsync(fd) < 0) {
- log_error("Failed to sync coredump: %m");
+ log_error("Failed to sync coredump %s: %m", tmp);
r = -errno;
goto fail;
}
if (fstat(fd, &st) < 0) {
- log_error("Failed to fstat coredump: %m");
+ log_error("Failed to fstat coredump %s: %m", tmp);
r = -errno;
goto fail;
}
if (rename(tmp, fn) < 0) {
- log_error("Failed to rename coredump: %m");
+ log_error("Failed to rename coredump %s -> %s: %m", tmp, fn);
r = -errno;
goto fail;
}
_cleanup_free_ char *field = NULL;
ssize_t n;
+ assert(fd >= 0);
assert(ret);
assert(ret_size);
_cleanup_free_ char *core_pid = NULL, *core_uid = NULL, *core_gid = NULL, *core_signal = NULL,
*core_timestamp = NULL, *core_comm = NULL, *core_exe = NULL, *core_unit = NULL,
*core_session = NULL, *core_message = NULL, *core_cmdline = NULL, *coredump_data = NULL,
- *coredump_filename = NULL, *core_slice = NULL, *core_cgroup = NULL, *core_owner_uid = NULL;
+ *coredump_filename = NULL, *core_slice = NULL, *core_cgroup = NULL, *core_owner_uid = NULL,
+ *exe = NULL, *comm = NULL;
+ const char *info[_INFO_LEN];
_cleanup_close_ int coredump_fd = -1;
* crashed and it might be journald which we'd rather not log
* to then. */
log_set_target(LOG_TARGET_KMSG);
- log_set_max_level(LOG_DEBUG);
log_open();
- if (argc != _ARG_MAX) {
- log_error("Invalid number of arguments passed from kernel.");
+ if (argc < INFO_COMM + 1) {
+ log_error("Not enough arguments passed from kernel (%d, expected %d).",
+ argc - 1, INFO_COMM + 1 - 1);
r = -EINVAL;
goto finish;
}
parse_config();
log_debug("Selected storage '%s'.", coredump_storage_to_string(arg_storage));
- r = parse_uid(argv[ARG_UID], &uid);
+ r = parse_uid(argv[INFO_UID + 1], &uid);
if (r < 0) {
log_error("Failed to parse UID.");
goto finish;
}
- r = parse_pid(argv[ARG_PID], &pid);
+ r = parse_pid(argv[INFO_PID + 1], &pid);
if (r < 0) {
log_error("Failed to parse PID.");
goto finish;
}
- r = parse_gid(argv[ARG_GID], &gid);
+ r = parse_gid(argv[INFO_GID + 1], &gid);
if (r < 0) {
log_error("Failed to parse GID.");
goto finish;
}
+ if (get_process_comm(pid, &comm) < 0) {
+ log_warning("Failed to get COMM, falling back to the commandline.");
+ comm = strv_join(argv + INFO_COMM + 1, " ");
+ }
+
+ if (get_process_exe(pid, &exe) < 0)
+ log_warning("Failed to get EXE.");
+
+ info[INFO_PID] = argv[INFO_PID + 1];
+ info[INFO_UID] = argv[INFO_UID + 1];
+ info[INFO_GID] = argv[INFO_GID + 1];
+ info[INFO_SIGNAL] = argv[INFO_SIGNAL + 1];
+ info[INFO_TIMESTAMP] = argv[INFO_TIMESTAMP + 1];
+ info[INFO_COMM] = comm;
+ info[INFO_EXE] = exe;
+
if (cg_pid_get_unit(pid, &t) >= 0) {
if (streq(t, SPECIAL_JOURNALD_SERVICE)) {
if (arg_storage != COREDUMP_STORAGE_NONE)
arg_storage = COREDUMP_STORAGE_EXTERNAL;
- r = save_external_coredump(argv, uid, &coredump_filename, &coredump_fd, &coredump_size);
+ r = save_external_coredump(info, uid, &coredump_filename, &coredump_fd, &coredump_size);
if (r < 0)
goto finish;
log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
log_open();
- core_pid = strappend("COREDUMP_PID=", argv[ARG_PID]);
+ core_pid = strappend("COREDUMP_PID=", info[INFO_PID]);
if (core_pid)
IOVEC_SET_STRING(iovec[j++], core_pid);
- core_uid = strappend("COREDUMP_UID=", argv[ARG_UID]);
+ core_uid = strappend("COREDUMP_UID=", info[INFO_UID]);
if (core_uid)
IOVEC_SET_STRING(iovec[j++], core_uid);
- core_gid = strappend("COREDUMP_GID=", argv[ARG_GID]);
+ core_gid = strappend("COREDUMP_GID=", info[INFO_GID]);
if (core_gid)
IOVEC_SET_STRING(iovec[j++], core_gid);
- core_signal = strappend("COREDUMP_SIGNAL=", argv[ARG_SIGNAL]);
+ core_signal = strappend("COREDUMP_SIGNAL=", info[INFO_SIGNAL]);
if (core_signal)
IOVEC_SET_STRING(iovec[j++], core_signal);
- core_comm = strappend("COREDUMP_COMM=", argv[ARG_COMM]);
- if (core_comm)
- IOVEC_SET_STRING(iovec[j++], core_comm);
-
if (sd_pid_get_session(pid, &t) >= 0) {
core_session = strappend("COREDUMP_SESSION=", t);
free(t);
IOVEC_SET_STRING(iovec[j++], core_slice);
}
- if (get_process_exe(pid, &t) >= 0) {
- core_exe = strappend("COREDUMP_EXE=", t);
- free(t);
+ if (comm) {
+ core_comm = strappend("COREDUMP_COMM=", comm);
+ if (core_comm)
+ IOVEC_SET_STRING(iovec[j++], core_comm);
+ }
+ if (exe) {
+ core_exe = strappend("COREDUMP_EXE=", exe);
if (core_exe)
IOVEC_SET_STRING(iovec[j++], core_exe);
}
IOVEC_SET_STRING(iovec[j++], core_cgroup);
}
- core_timestamp = strjoin("COREDUMP_TIMESTAMP=", argv[ARG_TIMESTAMP], "000000", NULL);
+ core_timestamp = strjoin("COREDUMP_TIMESTAMP=", info[INFO_TIMESTAMP], "000000", NULL);
if (core_timestamp)
IOVEC_SET_STRING(iovec[j++], core_timestamp);
IOVEC_SET_STRING(iovec[j++], "MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1");
IOVEC_SET_STRING(iovec[j++], "PRIORITY=2");
- core_message = strjoin("MESSAGE=Process ", argv[ARG_PID], " (", argv[ARG_COMM], ") dumped core.", NULL);
- if (core_message)
- IOVEC_SET_STRING(iovec[j++], core_message);
-
/* Always stream the coredump to disk, if that's possible */
- r = save_external_coredump(argv, uid, &coredump_filename, &coredump_fd, &coredump_size);
+ r = save_external_coredump(info, uid, &coredump_filename, &coredump_fd, &coredump_size);
if (r < 0)
- goto finish;
+ /* skip whole core dumping part */
+ goto log;
/* If we don't want to keep the coredump on disk, remove it
- * now, as later on we will lack the privileges for it. */
+ * now, as later on we will lack the privileges for
+ * it. However, we keep the fd to it, so that we can still
+ * process it and log it. */
r = maybe_remove_external_coredump(coredump_filename, coredump_size);
if (r < 0)
goto finish;
goto finish;
}
+#ifdef HAVE_ELFUTILS
+ /* Try to get a strack trace if we can */
+ if (coredump_size <= arg_process_size_max) {
+ _cleanup_free_ char *stacktrace = NULL;
+
+ r = coredump_make_stack_trace(coredump_fd, exe, &stacktrace);
+ if (r >= 0)
+ core_message = strjoin("MESSAGE=Process ", info[INFO_PID], " (", comm, ") of user ", info[INFO_UID], " dumped core.\n\n", stacktrace, NULL);
+ else
+ log_warning("Failed to generate stack trace: %s", strerror(-r));
+ }
+
+ if (!core_message)
+#endif
+log:
+ core_message = strjoin("MESSAGE=Process ", info[INFO_PID], " (", comm, ") of user ", info[INFO_UID], " dumped core.", NULL);
+ if (core_message)
+ IOVEC_SET_STRING(iovec[j++], core_message);
+
/* Optionally store the entire coredump in the journal */
if (IN_SET(arg_storage, COREDUMP_STORAGE_JOURNAL, COREDUMP_STORAGE_BOTH) &&
coredump_size <= (off_t) arg_journal_size_max) {
~ianmdlvl / elogind.git / blobdiff