diff -rup systemd-233/src/basic/io-util.c systemd-233-new/src/basic/io-util.c --- systemd-233/src/basic/io-util.c 2017-03-01 13:43:06.000000000 -0800 +++ systemd-233-new/src/basic/io-util.c 2019-01-24 17:46:32.773140156 -0800 @@ -25,6 +25,7 @@ #include #include "io-util.h" +#include "string-util.h" #include "time-util.h" int flush_fd(int fd) { @@ -267,3 +268,20 @@ ssize_t sparse_write(int fd, const void return q - (const uint8_t*) p; } + +char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value) { + char *x; + + x = strappend(field, value); + if (x) + iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x); + return x; +} + +char* set_iovec_field_free(struct iovec *iovec, size_t *n_iovec, const char *field, char *value) { + char *x; + + x = set_iovec_string_field(iovec, n_iovec, field, value); + free(value); + return x; +} diff -rup systemd-233/src/basic/io-util.h systemd-233-new/src/basic/io-util.h --- systemd-233/src/basic/io-util.h 2017-03-01 13:43:06.000000000 -0800 +++ systemd-233-new/src/basic/io-util.h 2019-01-24 17:47:05.627021107 -0800 @@ -93,3 +93,10 @@ static inline bool FILE_SIZE_VALID_OR_IN return FILE_SIZE_VALID(l); } + +#define IOVEC_INIT(base, len) { .iov_base = (base), .iov_len = (len) } +#define IOVEC_MAKE(base, len) (struct iovec) IOVEC_INIT(base, len) +#define IOVEC_INIT_STRING(string) IOVEC_INIT((char*) string, strlen(string)) +#define IOVEC_MAKE_STRING(string) (struct iovec) IOVEC_INIT_STRING(string) +char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value); +char* set_iovec_field_free(struct iovec *iovec, size_t *n_iovec, const char *field, char *value); diff -rup systemd-233/src/coredump/coredump.c systemd-233-new/src/coredump/coredump.c --- systemd-233/src/coredump/coredump.c 2017-03-01 13:43:06.000000000 -0800 +++ systemd-233-new/src/coredump/coredump.c 2019-01-24 15:35:49.543956161 -0800 @@ -1066,23 +1066,6 @@ static int send_iovec(const struct iovec return 0; } -static char* set_iovec_field(struct iovec iovec[27], size_t *n_iovec, const char *field, const char *value) { - char *x; - - x = strappend(field, value); - if (x) - IOVEC_SET_STRING(iovec[(*n_iovec)++], x); - return x; -} - -static char* set_iovec_field_free(struct iovec iovec[27], size_t *n_iovec, const char *field, char *value) { - char *x; - - x = set_iovec_field(iovec, n_iovec, field, value); - free(value); - return x; -} - static int gather_pid_metadata( char* context[_CONTEXT_MAX], char **comm_fallback, @@ -1128,33 +1111,33 @@ static int gather_pid_metadata( (void) write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0); } - set_iovec_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]); + set_iovec_string_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]); } if (cg_pid_get_user_unit(pid, &t) >= 0) set_iovec_field_free(iovec, n_iovec, "COREDUMP_USER_UNIT=", t); /* The next few are mandatory */ - if (!set_iovec_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID])) + if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID])) return log_oom(); - if (!set_iovec_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID])) + if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID])) return log_oom(); - if (!set_iovec_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID])) + if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID])) return log_oom(); - if (!set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL])) + if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL])) return log_oom(); - if (!set_iovec_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT])) + if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT])) return log_oom(); - if (!set_iovec_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM])) + if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM])) return log_oom(); if (context[CONTEXT_EXE] && - !set_iovec_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE])) + !set_iovec_string_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE])) return log_oom(); if (sd_pid_get_session(pid, &t) >= 0) @@ -1222,7 +1205,7 @@ static int gather_pid_metadata( IOVEC_SET_STRING(iovec[(*n_iovec)++], t); if (safe_atoi(context[CONTEXT_SIGNAL], &signo) >= 0 && SIGNAL_VALID(signo)) - set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo)); + set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo)); return 0; /* we successfully acquired all metadata */ } diff -rup systemd-233/src/journal/journald-server.c systemd-233-new/src/journal/journald-server.c --- systemd-233/src/journal/journald-server.c 2017-03-01 13:43:06.000000000 -0800 +++ systemd-233-new/src/journal/journald-server.c 2019-01-24 23:38:28.631885086 -0800 @@ -754,7 +754,7 @@ static int get_invocation_id(const char static void dispatch_message_real( Server *s, - struct iovec *iovec, unsigned n, unsigned m, + struct iovec *iovec, size_t n, size_t m, const struct ucred *ucred, const struct timeval *tv, const char *label, size_t label_len, @@ -771,6 +771,7 @@ static void dispatch_message_real( o_uid[sizeof("OBJECT_UID=") + DECIMAL_STR_MAX(uid_t)], o_gid[sizeof("OBJECT_GID=") + DECIMAL_STR_MAX(gid_t)], o_owner_uid[sizeof("OBJECT_SYSTEMD_OWNER_UID=") + DECIMAL_STR_MAX(uid_t)]; + _cleanup_free_ char *cmdline1 = NULL, *cmdline2 = NULL; uid_t object_uid; gid_t object_gid; char *x; @@ -821,9 +822,9 @@ static void dispatch_message_real( r = get_process_cmdline(ucred->pid, 0, false, &t); if (r >= 0) { - x = strjoina("_CMDLINE=", t); - free(t); - IOVEC_SET_STRING(iovec[n++], x); + /* At most _SC_ARG_MAX (2MB usually), which is too much to put on stack. + * Let's use a heap allocation for this one. */ + cmdline1 = set_iovec_field_free(iovec, &n, "_CMDLINE=", t); } r = get_process_capeff(ucred->pid, &t); @@ -968,9 +969,7 @@ static void dispatch_message_real( r = get_process_cmdline(object_pid, 0, false, &t); if (r >= 0) { - x = strjoina("OBJECT_CMDLINE=", t); - free(t); - IOVEC_SET_STRING(iovec[n++], x); + cmdline2 = set_iovec_field_free(iovec, &n, "OBJECT_CMDLINE=", t); } #ifdef HAVE_AUDIT @@ -1070,7 +1069,7 @@ static void dispatch_message_real( void server_driver_message(Server *s, const char *message_id, const char *format, ...) { struct iovec iovec[N_IOVEC_META_FIELDS + 5 + N_IOVEC_PAYLOAD_FIELDS]; - unsigned n = 0, m; + unsigned int n = 0, m; int r; va_list ap; struct ucred ucred = {}; @@ -1100,7 +1099,7 @@ void server_driver_message(Server *s, co ucred.gid = getgid(); if (r >= 0) - dispatch_message_real(s, iovec, n, ELEMENTSOF(iovec), &ucred, NULL, NULL, 0, NULL, LOG_INFO, 0, NULL); + dispatch_message_real(s, iovec, (size_t)n, (size_t)ELEMENTSOF(iovec), &ucred, NULL, NULL, 0, NULL, LOG_INFO, 0, NULL); while (m < n) free(iovec[m++].iov_base); @@ -1114,7 +1113,7 @@ void server_driver_message(Server *s, co n = 3; IOVEC_SET_STRING(iovec[n++], "PRIORITY=4"); IOVEC_SET_STRING(iovec[n++], buf); - dispatch_message_real(s, iovec, n, ELEMENTSOF(iovec), &ucred, NULL, NULL, 0, NULL, LOG_INFO, 0, NULL); + dispatch_message_real(s, iovec, (size_t)n, (size_t)ELEMENTSOF(iovec), &ucred, NULL, NULL, 0, NULL, LOG_INFO, 0, NULL); } } @@ -1185,7 +1184,7 @@ finish: /* restore cgroup path for logging */ if (c) *c = '/'; - dispatch_message_real(s, iovec, n, m, ucred, tv, label, label_len, unit_id, priority, object_pid, path); + dispatch_message_real(s, iovec, (size_t)n, (size_t)m, ucred, tv, label, label_len, unit_id, priority, object_pid, path); } int server_flush_to_var(Server *s, bool require_flag_file) {