1From 45d323fc889a55fae400a5b08a56273d5724ef4a Mon Sep 17 00:00:00 2001 2From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> 3Date: Tue, 29 Nov 2022 09:00:16 +0100 4Subject: [PATCH 1/2] coredump: adjust whitespace 5 6(cherry picked from commit 510a146634f3e095b34e2a26023b1b1f99dcb8c0) 7(cherry picked from commit cc2eb7a9b5fd6d9dd8ea35fb045ce6e5e16e1187) 8(cherry picked from commit cb044d734c44cd3c05a6e438b5b995b2a9cfa73c) 9 10Preparation to avoid conflicts when applying CVE CVE-2022-4415 11Upstream-Status: Backport [https://github.com/systemd/systemd-stable/commit/45d323fc889a55fae400a5b08a56273d5724ef4a] 12 13Signed-off-by: Peter Marko <peter.marko@siemens.com> 14--- 15 src/coredump/coredump.c | 56 ++++++++++++++++++++--------------------- 16 1 file changed, 28 insertions(+), 28 deletions(-) 17 18diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c 19index eaea63f682..8295b03ac7 100644 20--- a/src/coredump/coredump.c 21+++ b/src/coredump/coredump.c 22@@ -103,16 +103,16 @@ enum { 23 }; 24 25 static const char * const meta_field_names[_META_MAX] = { 26- [META_ARGV_PID] = "COREDUMP_PID=", 27- [META_ARGV_UID] = "COREDUMP_UID=", 28- [META_ARGV_GID] = "COREDUMP_GID=", 29- [META_ARGV_SIGNAL] = "COREDUMP_SIGNAL=", 30- [META_ARGV_TIMESTAMP] = "COREDUMP_TIMESTAMP=", 31- [META_ARGV_RLIMIT] = "COREDUMP_RLIMIT=", 32- [META_ARGV_HOSTNAME] = "COREDUMP_HOSTNAME=", 33- [META_COMM] = "COREDUMP_COMM=", 34- [META_EXE] = "COREDUMP_EXE=", 35- [META_UNIT] = "COREDUMP_UNIT=", 36+ [META_ARGV_PID] = "COREDUMP_PID=", 37+ [META_ARGV_UID] = "COREDUMP_UID=", 38+ [META_ARGV_GID] = "COREDUMP_GID=", 39+ [META_ARGV_SIGNAL] = "COREDUMP_SIGNAL=", 40+ [META_ARGV_TIMESTAMP] = "COREDUMP_TIMESTAMP=", 41+ [META_ARGV_RLIMIT] = "COREDUMP_RLIMIT=", 42+ [META_ARGV_HOSTNAME] = "COREDUMP_HOSTNAME=", 43+ [META_COMM] = "COREDUMP_COMM=", 44+ [META_EXE] = "COREDUMP_EXE=", 45+ [META_UNIT] = "COREDUMP_UNIT=", 46 }; 47 48 typedef struct Context { 49@@ -131,9 +131,9 @@ typedef enum CoredumpStorage { 50 } CoredumpStorage; 51 52 static const char* const coredump_storage_table[_COREDUMP_STORAGE_MAX] = { 53- [COREDUMP_STORAGE_NONE] = "none", 54+ [COREDUMP_STORAGE_NONE] = "none", 55 [COREDUMP_STORAGE_EXTERNAL] = "external", 56- [COREDUMP_STORAGE_JOURNAL] = "journal", 57+ [COREDUMP_STORAGE_JOURNAL] = "journal", 58 }; 59 60 DEFINE_PRIVATE_STRING_TABLE_LOOKUP(coredump_storage, CoredumpStorage); 61@@ -149,13 +149,13 @@ static uint64_t arg_max_use = UINT64_MAX; 62 63 static int parse_config(void) { 64 static const ConfigTableItem items[] = { 65- { "Coredump", "Storage", config_parse_coredump_storage, 0, &arg_storage }, 66- { "Coredump", "Compress", config_parse_bool, 0, &arg_compress }, 67- { "Coredump", "ProcessSizeMax", config_parse_iec_uint64, 0, &arg_process_size_max }, 68- { "Coredump", "ExternalSizeMax", config_parse_iec_uint64_infinity, 0, &arg_external_size_max }, 69- { "Coredump", "JournalSizeMax", config_parse_iec_size, 0, &arg_journal_size_max }, 70- { "Coredump", "KeepFree", config_parse_iec_uint64, 0, &arg_keep_free }, 71- { "Coredump", "MaxUse", config_parse_iec_uint64, 0, &arg_max_use }, 72+ { "Coredump", "Storage", config_parse_coredump_storage, 0, &arg_storage }, 73+ { "Coredump", "Compress", config_parse_bool, 0, &arg_compress }, 74+ { "Coredump", "ProcessSizeMax", config_parse_iec_uint64, 0, &arg_process_size_max }, 75+ { "Coredump", "ExternalSizeMax", config_parse_iec_uint64_infinity, 0, &arg_external_size_max }, 76+ { "Coredump", "JournalSizeMax", config_parse_iec_size, 0, &arg_journal_size_max }, 77+ { "Coredump", "KeepFree", config_parse_iec_uint64, 0, &arg_keep_free }, 78+ { "Coredump", "MaxUse", config_parse_iec_uint64, 0, &arg_max_use }, 79 {} 80 }; 81 82@@ -201,15 +201,15 @@ static int fix_acl(int fd, uid_t uid) { 83 static int fix_xattr(int fd, const Context *context) { 84 85 static const char * const xattrs[_META_MAX] = { 86- [META_ARGV_PID] = "user.coredump.pid", 87- [META_ARGV_UID] = "user.coredump.uid", 88- [META_ARGV_GID] = "user.coredump.gid", 89- [META_ARGV_SIGNAL] = "user.coredump.signal", 90- [META_ARGV_TIMESTAMP] = "user.coredump.timestamp", 91- [META_ARGV_RLIMIT] = "user.coredump.rlimit", 92- [META_ARGV_HOSTNAME] = "user.coredump.hostname", 93- [META_COMM] = "user.coredump.comm", 94- [META_EXE] = "user.coredump.exe", 95+ [META_ARGV_PID] = "user.coredump.pid", 96+ [META_ARGV_UID] = "user.coredump.uid", 97+ [META_ARGV_GID] = "user.coredump.gid", 98+ [META_ARGV_SIGNAL] = "user.coredump.signal", 99+ [META_ARGV_TIMESTAMP] = "user.coredump.timestamp", 100+ [META_ARGV_RLIMIT] = "user.coredump.rlimit", 101+ [META_ARGV_HOSTNAME] = "user.coredump.hostname", 102+ [META_COMM] = "user.coredump.comm", 103+ [META_EXE] = "user.coredump.exe", 104 }; 105 106 int r = 0; 107-- 1082.30.2 109 110