summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-04-08 20:32:03 +0200
committerLennart Poettering <lennart@poettering.net>2013-04-08 20:35:26 +0200
commitc4aa09b06f835c91cea9e021df4c3605cff2318d (patch)
treedea3f0e9329b33edf59f05a5cf6a6f14b1ff8bf7
parent3df82d5a8cdc510f518fd5e234ccb3233b748719 (diff)
journald: bring max coredump size in sync with max entry size
-rw-r--r--src/journal/coredump.c2
-rw-r--r--src/journal/journald-native.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index c56d28326..2dfb04afd 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 069114778..9d1f39f0c 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;