coredump: never write more than the configured processing size limit to disk

[elogind.git] / src / journal / coredump.c

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 442c969778a5ddbd861a5a13b04c2b8ef0f03e1f..1b35eb169873064079fa6c5c9c1bc20a07e8c53b 100644 (file)
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -39,6 +39,7 @@
 #include "conf-parser.h"
 #include "copy.h"
 #include "stacktrace.h"
+#include "path-util.h"
 
 #ifdef HAVE_ACL
 #include <sys/acl.h>
@@ -186,7 +187,7 @@ static int fix_xattr(int fd, char *argv[]) {
         return r;
 }
 
-#define filename_escape(s) xescape((s), "./")
+#define filename_escape(s) xescape((s), "./ ")
 
 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;
@@ -239,8 +240,14 @@ static int save_external_coredump(char **argv, uid_t uid, char **ret_filename, i
                 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.", argv[ARG_PID], argv[ARG_COMM]);
+                goto fail;
+        } else if (IN_SET(r, -EDQUOT, -ENOSPC)) {
+                log_error("Not enough disk space for coredump of %s (%s), refusing.", argv[ARG_PID], argv[ARG_COMM]);
+                goto fail;
+        } else if (r < 0) {
                 log_error("Failed to dump coredump to file: %s", strerror(-r));
                 goto fail;
         }
@@ -375,6 +382,13 @@ int main(int argc, char* argv[]) {
         parse_config();
         log_debug("Selected storage '%s'.", coredump_storage_to_string(arg_storage));
 
+        /* Exit early if we cannot write the coredump to disk anyway */
+        if (path_is_read_only_fs("/var/lib") != 0) {
+                log_error("Coredump directory not mounted or not writable, skipping coredump.");
+                r = -EROFS;
+                goto finish;
+        }
+
         r = parse_uid(argv[ARG_UID], &uid);
         if (r < 0) {
                 log_error("Failed to parse UID.");