X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fcoredump.c;h=29342de6811d25fbe48123cd063b5cd0edd0c790;hb=4dd5da7f7d37f964fe95b0f0d451d7843a34591d;hp=fd03e389bb332a53e44584eecfef37fb00613908;hpb=910003d022ed299b50ab36228732bb74a23d46ba;p=elogind.git

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index fd03e389b..29342de68 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -36,12 +36,14 @@
 #include "mkdir.h"
 #include "special.h"
 #include "cgroup-util.h"
+#include "journald-native.h"
 
 /* Few programs have less than 3MiB resident */
 #define COREDUMP_MIN_START (3*1024*1024)
 /* Make sure to not make this larger than the maximum journal entry
  * size. See ENTRY_SIZE_MAX in journald-native.c. */
-#define COREDUMP_MAX (768*1024*1024)
+#define COREDUMP_MAX (767*1024*1024)
+assert_cc(COREDUMP_MAX <= ENTRY_SIZE_MAX);
 
 enum {
         ARG_PID = 1,
@@ -240,8 +242,8 @@ int main(int argc, char* argv[]) {
         coredump_bufsize = COREDUMP_MIN_START;
         coredump_data = malloc(coredump_bufsize);
         if (!coredump_data) {
-                r = log_oom();
-                goto finish;
+                log_warning("Failed to allocate memory for core, core will not be stored.");
+                goto finalize;
         }
 
         memcpy(coredump_data, "COREDUMP=", 9);
@@ -251,16 +253,22 @@ int main(int argc, char* argv[]) {
                 n = loop_read(STDIN_FILENO, coredump_data + coredump_size,
                               coredump_bufsize - coredump_size, false);
                 if (n < 0) {
-                        log_error("Failed to read core dump data: %s", strerror(-n));
+                        log_error("Failed to read core data: %s", strerror(-n));
                         r = (int) n;
                         goto finish;
                 } else if (n == 0)
                         break;
 
                 coredump_size += n;
+
+                if (coredump_size > COREDUMP_MAX) {
+                        log_error("Core too large, core will not be stored.");
+                        goto finalize;
+                }
+
                 if (!GREEDY_REALLOC(coredump_data, coredump_bufsize, coredump_size + 1)) {
-                        r = log_oom();
-                        goto finish;
+                        log_warning("Failed to allocate memory for core, core will not be stored.");
+                        goto finalize;
                 }
         }
 
@@ -268,9 +276,10 @@ int main(int argc, char* argv[]) {
         iovec[j].iov_len = coredump_size;
         j++;
 
+finalize:
         r = sd_journal_sendv(iovec, j);
         if (r < 0)
-                log_error("Failed to send coredump: %s", strerror(-r));
+                log_error("Failed to log coredump: %s", strerror(-r));
 
 finish:
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;