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

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 764c5e72ab3c9596231981c1e962eb51334d8719..1b35eb169873064079fa6c5c9c1bc20a07e8c53b 100644 (file)
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -240,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;
         }

diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index fefd02bc9b26ec3a693afa91538a55d2109004fa..48e63415b15e2b54be5ea3ab92db2f54093ad5e3 100644 (file)
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -659,7 +659,7 @@ static int dump_core(sd_journal* j) {
                         return -errno;
                 }
 
-                r = copy_bytes(fd, output ? fileno(output) : STDOUT_FILENO);
+                r = copy_bytes(fd, output ? fileno(output) : STDOUT_FILENO, (off_t) -1);
                 if (r < 0) {
                         log_error("Failed to stream coredump: %s", strerror(-r));
                         return r;

diff --git a/src/shared/copy.c b/src/shared/copy.c
index 7c3fab6901020c0db85520dce2224a85829137c2..ebd66998384db7b33610ecbbbe83cdb577dc2724 100644 (file)
--- a/src/shared/copy.c
+++ b/src/shared/copy.c
@@ -22,15 +22,27 @@
 #include "util.h"
 #include "copy.h"
 
-int copy_bytes(int fdf, int fdt) {
+int copy_bytes(int fdf, int fdt, off_t max_bytes) {
         assert(fdf >= 0);
         assert(fdt >= 0);
 
         for (;;) {
                 char buf[PIPE_BUF];
                 ssize_t n, k;
+                size_t m;
 
-                n = read(fdf, buf, sizeof(buf));
+                m = sizeof(buf);
+
+                if (max_bytes != (off_t) -1) {
+
+                        if (max_bytes <= 0)
+                                return -E2BIG;
+
+                        if ((off_t) m > max_bytes)
+                                m = (size_t) max_bytes;
+                }
+
+                n = read(fdf, buf, m);
                 if (n < 0)
                         return -errno;
                 if (n == 0)
@@ -42,6 +54,11 @@ int copy_bytes(int fdf, int fdt) {
                         return k;
                 if (k != n)
                         return errno ? -errno : -EIO;
+
+                if (max_bytes != (off_t) -1) {
+                        assert(max_bytes >= n);
+                        max_bytes -= n;
+                }
         }
 
         return 0;
@@ -84,7 +101,7 @@ static int fd_copy_regular(int df, const char *from, const struct stat *st, int
         if (fdt < 0)
                 return -errno;
 
-        r = copy_bytes(fdf, fdt);
+        r = copy_bytes(fdf, fdt, (off_t) -1);
         if (r < 0) {
                 unlinkat(dt, to, 0);
                 return r;
@@ -262,7 +279,7 @@ int copy_file(const char *from, const char *to, int flags, mode_t mode) {
         if (fdt < 0)
                 return -errno;
 
-        r = copy_bytes(fdf, fdt);
+        r = copy_bytes(fdf, fdt, (off_t) -1);
         if (r < 0) {
                 unlink(to);
                 return r;

diff --git a/src/shared/copy.h b/src/shared/copy.h
index 1d5e0adc53155465fdb12436b6e78572e3c43904..0bf2598f60df4be0bc1f321a8069dce5c91076f1 100644 (file)
--- a/src/shared/copy.h
+++ b/src/shared/copy.h
@@ -23,4 +23,4 @@
 
 int copy_file(const char *from, const char *to, int flags, mode_t mode);
 int copy_tree(const char *from, const char *to, bool merge);
-int copy_bytes(int fdf, int fdt);
+int copy_bytes(int fdf, int fdt, off_t max_bytes);

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index d549969ff25bde7cb2f68f8ddd80ddc837fb2280..c192add61f28a4cfb4c117288283004ddedecd0e 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -211,7 +211,7 @@ static int make_backup(const char *x) {
         if (dst < 0)
                 return dst;
 
-        r = copy_bytes(src, dst);
+        r = copy_bytes(src, dst, (off_t) -1);
         if (r < 0)
                 goto fail;