From e677041e7a6988f73de802db6e49d962d432944b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Feb 2022 11:52:17 +0100
Subject: [PATCH 1/2] coredump: raise the coredump save size on 64bit systems
 to 32G (and lower it to 1G on 32bit systems)

Apparently 2G is too low for various real-life systems. But raising it
universally above 2^32 sounds wrong to me, since that makes no sense on
32bit systems, that we still support.

Hence, let's raise the limit to 32G on 64bit systems, and *lower* it to
1G on 32bit systems.

32G is 4 orders of magnitude higher then the old settings. Let's hope
that's enough for now. Should this not be enough we can raise it
further.

Fixes: #22076
---
 src/coredump/coredump.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 20503cfd3b..aac75dc552 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -48,8 +48,14 @@
 #include "uid-alloc-range.h"
 #include "user-util.h"
 
-/* The maximum size up to which we process coredumps */
-#define PROCESS_SIZE_MAX ((uint64_t) (2LLU*1024LLU*1024LLU*1024LLU))
+/* The maximum size up to which we process coredumps. We use 1G on 32bit systems, and 32G on 64bit systems */
+#if __SIZEOF_POINTER__ == 4
+#define PROCESS_SIZE_MAX ((uint64_t) (1LLU*1024LLU*1024LLU*1024LLU))
+#elif __SIZEOF_POINTER__ == 8
+#define PROCESS_SIZE_MAX ((uint64_t) (32LLU*1024LLU*1024LLU*1024LLU))
+#else
+#error "Unexpected pointer size"
+#endif
 
 /* The maximum size up to which we leave the coredump around on disk */
 #define EXTERNAL_SIZE_MAX PROCESS_SIZE_MAX

From 56c29baba4bb03cbb67ba796eff01759c8aae729 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Feb 2022 11:54:37 +0100
Subject: [PATCH 2/2] man: coredump.conf: document defaults limits

---
 man/coredump.conf.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index 6392270543..7cb71f80aa 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -85,7 +85,8 @@
 
         <listitem><para>The maximum size in bytes of a core which will be processed. Core dumps exceeding
         this size may be stored, but the backtrace will not be generated.  Like other sizes in this same
-        config file, the usual suffixes to the base of 1024 are allowed (B, K, M, G, T, P, and E).</para>
+        config file, the usual suffixes to the base of 1024 are allowed (B, K, M, G, T, P, and E). Defaults
+        to 1G on 32bit systems, 32G on 64bit systems.</para>
 
         <para>Setting <varname>Storage=none</varname> and <varname>ProcessSizeMax=0</varname>
         disables all coredump handling except for a log entry.</para>
@@ -96,8 +97,9 @@
         <term><varname>ExternalSizeMax=</varname></term>
         <term><varname>JournalSizeMax=</varname></term>
 
-        <listitem><para>The maximum (compressed or uncompressed) size in bytes of a core to be saved. Unit
-        suffixes are allowed just as in <option>ProcessSizeMax=</option>.</para></listitem>
+        <listitem><para>The maximum (compressed or uncompressed) size in bytes of a core to be saved in
+        separate files on disk (default: 1G on 32bit, 32G on 64bit systems) or in the journal (default:
+        10M). Unit suffixes are allowed just as in <option>ProcessSizeMax=</option>.</para></listitem>
 
         <para><varname>ExternalSizeMax=infinity</varname> sets the core size to unlimited.</para>
       </varlistentry>