X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fcoredump.c;h=d322e7984c51d51a0004a4cfba2154a37ab50c88;hb=f8eeeaf9b783ebbab30672629abf3920db286811;hp=c22d0b0471117d2ba133ad149cfe1fe30a76017f;hpb=23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41;p=elogind.git diff --git a/src/journal/coredump.c b/src/journal/coredump.c index c22d0b047..d322e7984 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -49,11 +49,7 @@ #include "path-util.h" #include "compress.h" #include "coredump-vacuum.h" - -#ifdef HAVE_ACL -# include -# include "acl-util.h" -#endif +#include "acl-util.h" /* The maximum size up to which we process coredumps */ #define PROCESS_SIZE_MAX ((off_t) (2LLU*1024LLU*1024LLU*1024LLU)) @@ -120,10 +116,11 @@ static int parse_config(void) { {} }; - return config_parse(NULL, "/etc/systemd/coredump.conf", NULL, - "Coredump\0", - config_item_table_lookup, items, - false, false, true, NULL); + return config_parse_many("/etc/systemd/coredump.conf", + CONF_DIRS_NULSTR("systemd/coredump.conf"), + "Coredump\0", + config_item_table_lookup, items, + false, NULL); } static int fix_acl(int fd, uid_t uid) { @@ -142,29 +139,25 @@ static int fix_acl(int fd, uid_t uid) { * their own coredumps */ acl = acl_get_fd(fd); - if (!acl) { - log_error("Failed to get ACL: %m"); - return -errno; - } + if (!acl) + return log_error_errno(errno, "Failed to get ACL: %m"); if (acl_create_entry(&acl, &entry) < 0 || acl_set_tag_type(entry, ACL_USER) < 0 || acl_set_qualifier(entry, &uid) < 0) { - log_error("Failed to patch ACL: %m"); + log_error_errno(errno, "Failed to patch ACL: %m"); return -errno; } if (acl_get_permset(entry, &permset) < 0 || acl_add_perm(permset, ACL_READ) < 0 || calc_acl_mask_if_needed(&acl) < 0) { - log_warning("Failed to patch ACL: %m"); + log_warning_errno(errno, "Failed to patch ACL: %m"); return -errno; } - if (acl_set_fd(fd, acl) < 0) { - log_error("Failed to apply ACL: %m"); - return -errno; - } + if (acl_set_fd(fd, acl) < 0) + return log_error_errno(errno, "Failed to apply ACL: %m"); #endif return 0; @@ -223,15 +216,11 @@ static int fix_permissions( fix_acl(fd, uid); fix_xattr(fd, info); - if (fsync(fd) < 0) { - log_error("Failed to sync coredump %s: %m", filename); - return -errno; - } + if (fsync(fd) < 0) + return log_error_errno(errno, "Failed to sync coredump %s: %m", filename); - if (rename(filename, target) < 0) { - log_error("Failed to rename coredump %s -> %s: %m", filename, target); - return -errno; - } + if (rename(filename, target) < 0) + return log_error_errno(errno, "Failed to rename coredump %s -> %s: %m", filename, target); return 0; } @@ -247,10 +236,8 @@ static int maybe_remove_external_coredump(const char *filename, off_t size) { if (!filename) return 1; - if (unlink(filename) < 0 && errno != ENOENT) { - log_error("Failed to unlink %s: %m", filename); - return -errno; - } + if (unlink(filename) < 0 && errno != ENOENT) + return log_error_errno(errno, "Failed to unlink %s: %m", filename); return 1; } @@ -315,19 +302,17 @@ static int save_external_coredump( if (r < 0) return log_error_errno(r, "Failed to determine coredump file name: %m"); - tmp = tempfn_random(fn); - if (!tmp) - return log_oom(); + r = tempfn_random(fn, &tmp); + if (r < 0) + return log_error_errno(r, "Failed to determine temporary file name: %m"); mkdir_p_label("/var/lib/systemd/coredump", 0755); fd = open(tmp, O_CREAT|O_EXCL|O_RDWR|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW, 0640); - if (fd < 0) { - log_error("Failed to create coredump file %s: %m", tmp); - return -errno; - } + if (fd < 0) + return log_error_errno(errno, "Failed to create coredump file %s: %m", tmp); - r = copy_bytes(STDIN_FILENO, fd, arg_process_size_max); + r = copy_bytes(STDIN_FILENO, fd, arg_process_size_max, false); if (r == -EFBIG) { log_error("Coredump of %s (%s) is larger than configured processing limit, refusing.", info[INFO_PID], info[INFO_COMM]); goto fail; @@ -340,12 +325,12 @@ static int save_external_coredump( } if (fstat(fd, &st) < 0) { - log_error("Failed to fstat coredump %s: %m", tmp); + log_error_errno(errno, "Failed to fstat coredump %s: %m", tmp); goto fail; } if (lseek(fd, 0, SEEK_SET) == (off_t) -1) { - log_error("Failed to seek on %s: %m", tmp); + log_error_errno(errno, "Failed to seek on %s: %m", tmp); goto fail; } @@ -363,15 +348,15 @@ static int save_external_coredump( goto uncompressed; } - tmp_compressed = tempfn_random(fn_compressed); - if (!tmp_compressed) { - log_oom(); + r = tempfn_random(fn_compressed, &tmp_compressed); + if (r < 0) { + log_error_errno(r, "Failed to determine temporary file name for %s: %m", fn_compressed); goto uncompressed; } fd_compressed = open(tmp_compressed, O_CREAT|O_EXCL|O_RDWR|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW, 0640); if (fd_compressed < 0) { - log_error("Failed to create file %s: %m", tmp_compressed); + log_error_errno(errno, "Failed to create file %s: %m", tmp_compressed); goto uncompressed; } @@ -429,10 +414,8 @@ static int allocate_journal_field(int fd, size_t size, char **ret, size_t *ret_s assert(ret); assert(ret_size); - if (lseek(fd, 0, SEEK_SET) == (off_t) -1) { - log_warning("Failed to seek: %m"); - return -errno; - } + if (lseek(fd, 0, SEEK_SET) == (off_t) -1) + return log_warning_errno(errno, "Failed to seek: %m"); field = malloc(9 + size); if (!field) { @@ -473,12 +456,13 @@ static int allocate_journal_field(int fd, size_t size, char **ret, size_t *ret_s * EOF */ static int compose_open_fds(pid_t pid, char **open_fds) { + _cleanup_closedir_ DIR *proc_fd_dir = NULL; + _cleanup_close_ int proc_fdinfo_fd = -1; + _cleanup_free_ char *buffer = NULL; _cleanup_fclose_ FILE *stream = NULL; - size_t ignored_size; const char *fddelim = "", *path; struct dirent *dent = NULL; - _cleanup_closedir_ DIR *proc_fd_dir = NULL; - _cleanup_close_ int proc_fdinfo_fd = -1; + size_t size = 0; int r = 0; assert(pid >= 0); @@ -489,23 +473,19 @@ static int compose_open_fds(pid_t pid, char **open_fds) { if (!proc_fd_dir) return -errno; - proc_fdinfo_fd = openat(dirfd(proc_fd_dir), "../fdinfo", - O_DIRECTORY|O_NOFOLLOW|O_CLOEXEC|O_PATH); + proc_fdinfo_fd = openat(dirfd(proc_fd_dir), "../fdinfo", O_DIRECTORY|O_NOFOLLOW|O_CLOEXEC|O_PATH); if (proc_fdinfo_fd < 0) return -errno; - stream = open_memstream(open_fds, &ignored_size); + stream = open_memstream(&buffer, &size); if (!stream) return -ENOMEM; - for (dent = readdir(proc_fd_dir); dent != NULL; dent = readdir(proc_fd_dir)) { - _cleanup_free_ char *fdname = NULL; - int fd; + FOREACH_DIRENT(dent, proc_fd_dir, return -errno) { _cleanup_fclose_ FILE *fdinfo = NULL; + _cleanup_free_ char *fdname = NULL; char line[LINE_MAX]; - - if (dent->d_name[0] == '.' || strcmp(dent->d_name, "..") == 0) - continue; + int fd; r = readlinkat_malloc(dirfd(proc_fd_dir), dent->d_name, &fdname); if (r < 0) @@ -525,23 +505,42 @@ static int compose_open_fds(pid_t pid, char **open_fds) { continue; } - while(fgets(line, sizeof(line), fdinfo) != NULL) - fprintf(stream, "%s%s", - line, strchr(line, '\n') == NULL ? "\n" : ""); + FOREACH_LINE(line, fdinfo, break) { + fputs(line, stream); + if (!endswith(line, "\n")) + fputc('\n', stream); + } } + errno = 0; + fclose(stream); + stream = NULL; + + if (errno != 0) + return -errno; + + *open_fds = buffer; + buffer = NULL; + return 0; } int main(int argc, char* argv[]) { - _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, - *core_slice = NULL, *core_cgroup = NULL, *core_owner_uid = NULL, *core_open_fds = NULL, - *core_proc_status = NULL, *core_proc_maps = NULL, *core_proc_limits = NULL, *core_proc_cgroup = NULL, - *core_cwd = NULL, *core_root = NULL, *core_environ = NULL, - *exe = NULL, *comm = NULL, *filename = NULL; + /* The small core field we allocate on the stack, to keep things simple */ + char + *core_pid = NULL, *core_uid = NULL, *core_gid = NULL, *core_signal = NULL, + *core_session = NULL, *core_exe = NULL, *core_comm = NULL, *core_cmdline = NULL, + *core_cgroup = NULL, *core_cwd = NULL, *core_root = NULL, *core_unit = NULL, + *core_slice = NULL; + + /* The larger ones we allocate on the heap */ + _cleanup_free_ char + *core_timestamp = NULL, *core_message = NULL, *coredump_data = NULL, *core_owner_uid = NULL, + *core_open_fds = NULL, *core_proc_status = NULL, *core_proc_maps = NULL, *core_proc_limits = NULL, + *core_proc_cgroup = NULL, *core_environ = NULL; + + _cleanup_free_ char *exe = NULL, *comm = NULL, *filename = NULL; const char *info[_INFO_LEN]; _cleanup_close_ int coredump_fd = -1; @@ -614,6 +613,7 @@ int main(int argc, char* argv[]) { if (cg_pid_get_unit(pid, &t) >= 0) { if (streq(t, SPECIAL_JOURNALD_SERVICE)) { + free(t); /* If we are journald, we cut things short, * don't write to the journal, but still @@ -634,9 +634,13 @@ int main(int argc, char* argv[]) { goto finish; } - core_unit = strappend("COREDUMP_UNIT=", t); - } else if (cg_pid_get_user_unit(pid, &t) >= 0) - core_unit = strappend("COREDUMP_USER_UNIT=", t); + core_unit = strappenda("COREDUMP_UNIT=", t); + free(t); + + } else if (cg_pid_get_user_unit(pid, &t) >= 0) { + core_unit = strappenda("COREDUMP_USER_UNIT=", t); + free(t); + } if (core_unit) IOVEC_SET_STRING(iovec[j++], core_unit); @@ -646,28 +650,23 @@ int main(int argc, char* argv[]) { log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); log_open(); - core_pid = strappend("COREDUMP_PID=", info[INFO_PID]); - if (core_pid) - IOVEC_SET_STRING(iovec[j++], core_pid); + core_pid = strappenda("COREDUMP_PID=", info[INFO_PID]); + IOVEC_SET_STRING(iovec[j++], core_pid); - core_uid = strappend("COREDUMP_UID=", info[INFO_UID]); - if (core_uid) - IOVEC_SET_STRING(iovec[j++], core_uid); + core_uid = strappenda("COREDUMP_UID=", info[INFO_UID]); + IOVEC_SET_STRING(iovec[j++], core_uid); - core_gid = strappend("COREDUMP_GID=", info[INFO_GID]); - if (core_gid) - IOVEC_SET_STRING(iovec[j++], core_gid); + core_gid = strappenda("COREDUMP_GID=", info[INFO_GID]); + IOVEC_SET_STRING(iovec[j++], core_gid); - core_signal = strappend("COREDUMP_SIGNAL=", info[INFO_SIGNAL]); - if (core_signal) - IOVEC_SET_STRING(iovec[j++], core_signal); + core_signal = strappenda("COREDUMP_SIGNAL=", info[INFO_SIGNAL]); + IOVEC_SET_STRING(iovec[j++], core_signal); if (sd_pid_get_session(pid, &t) >= 0) { - core_session = strappend("COREDUMP_SESSION=", t); + core_session = strappenda("COREDUMP_SESSION=", t); free(t); - if (core_session) - IOVEC_SET_STRING(iovec[j++], core_session); + IOVEC_SET_STRING(iovec[j++], core_session); } if (sd_pid_get_owner_uid(pid, &owner_uid) >= 0) { @@ -678,39 +677,34 @@ int main(int argc, char* argv[]) { } if (sd_pid_get_slice(pid, &t) >= 0) { - core_slice = strappend("COREDUMP_SLICE=", t); + core_slice = strappenda("COREDUMP_SLICE=", t); free(t); - if (core_slice) - IOVEC_SET_STRING(iovec[j++], core_slice); + IOVEC_SET_STRING(iovec[j++], core_slice); } if (comm) { - core_comm = strappend("COREDUMP_COMM=", comm); - if (core_comm) - IOVEC_SET_STRING(iovec[j++], core_comm); + core_comm = strappenda("COREDUMP_COMM=", 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); + core_exe = strappenda("COREDUMP_EXE=", exe); + IOVEC_SET_STRING(iovec[j++], core_exe); } if (get_process_cmdline(pid, 0, false, &t) >= 0) { - core_cmdline = strappend("COREDUMP_CMDLINE=", t); + core_cmdline = strappenda("COREDUMP_CMDLINE=", t); free(t); - if (core_cmdline) - IOVEC_SET_STRING(iovec[j++], core_cmdline); + IOVEC_SET_STRING(iovec[j++], core_cmdline); } if (cg_pid_get_path_shifted(pid, NULL, &t) >= 0) { - core_cgroup = strappend("COREDUMP_CGROUP=", t); + core_cgroup = strappenda("COREDUMP_CGROUP=", t); free(t); - if (core_cgroup) - IOVEC_SET_STRING(iovec[j++], core_cgroup); + IOVEC_SET_STRING(iovec[j++], core_cgroup); } if (compose_open_fds(pid, &t) >= 0) { @@ -758,19 +752,17 @@ int main(int argc, char* argv[]) { } if (get_process_cwd(pid, &t) >= 0) { - core_cwd = strappend("COREDUMP_CWD=", t); + core_cwd = strappenda("COREDUMP_CWD=", t); free(t); - if (core_cwd) - IOVEC_SET_STRING(iovec[j++], core_cwd); + IOVEC_SET_STRING(iovec[j++], core_cwd); } if (get_process_root(pid, &t) >= 0) { - core_root = strappend("COREDUMP_ROOT=", t); + core_root = strappenda("COREDUMP_ROOT=", t); free(t); - if (core_root) - IOVEC_SET_STRING(iovec[j++], core_root); + IOVEC_SET_STRING(iovec[j++], core_root); } if (get_process_environ(pid, &t) >= 0) { @@ -821,7 +813,7 @@ int main(int argc, char* argv[]) { * thus making sure the user gets access to the core dump. */ if (setresgid(gid, gid, gid) < 0 || setresuid(uid, uid, uid) < 0) { - log_error("Failed to drop privileges: %m"); + log_error_errno(errno, "Failed to drop privileges: %m"); r = -errno; goto finish; }