From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 8 Apr 2013 18:32:03 +0000 (+0200)
Subject: journald: bring max coredump size in sync with max entry size
X-Git-Tag: v201~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4aa09b06f835c91cea9e021df4c3605cff2318d;p=thirdparty%2Fsystemd.git

journald: bring max coredump size in sync with max entry size
---

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index c56d2832682..2dfb04afdf2 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -37,6 +37,8 @@
 #include "special.h"
 #include "cgroup-util.h"
 
+/* 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)
 
 enum {
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 069114778b3..9d1f39f0c5e 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -31,8 +31,10 @@
 #include "journald-console.h"
 #include "journald-syslog.h"
 
-#define ENTRY_SIZE_MAX (1024*1024*64)
-#define DATA_SIZE_MAX (1024*1024*64)
+/* Make sure not to make this smaller than the maximum coredump
+ * size. See COREDUMP_MAX in coredump.c */
+#define ENTRY_SIZE_MAX (1024*1024*768)
+#define DATA_SIZE_MAX (1024*1024*768)
 
 static bool valid_user_field(const char *p, size_t l) {
         const char *a;