new file mode 100644

@@ -0,0 +1,204 @@

+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

+@@ -25,6 +25,7 @@

+ #include <unistd.h>

+ 

+ #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

+@@ -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

+@@ -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

+@@ -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) {

new file mode 100644

@@ -0,0 +1,101 @@

+Subject: [PATCH 06/11] journald: set a limit on the number of fields (1k)

+

+We allocate a iovec entry for each field, so with many short entries,

+our memory usage and processing time can be large, even with a relatively

+small message size. Let's refuse overly long entries.

+

+CVE-2018-16865

+https://bugzilla.redhat.com/show_bug.cgi?id=1653861

+

+What from I can see, the problem is not from an alloca, despite what the CVE

+description says, but from the attack multiplication that comes from creating

+many very small iovecs: (void* + size_t) for each three bytes of input message.

+

+Subject: [PATCH 11/11] journal-remote: set a limit on the number of fields in

+ a message

+

+Existing use of E2BIG is replaced with ENOBUFS (entry too long), and E2BIG is

+reused for the new error condition (too many fields).

+

+This matches the change done for systemd-journald, hence forming the second

+part of the fix for CVE-2018-16865

+(https://bugzilla.redhat.com/show_bug.cgi?id=1653861).

+

+diff -rup systemd-233/src/basic/journal-importer.c systemd-233-new/src/basic/journal-importer.c

+--- systemd-233/src/basic/journal-importer.c	2017-03-01 13:43:06.000000000 -0800

+@@ -34,6 +34,9 @@ enum {

+ };

+ 

+ static int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) {

++        if (iovw->count >= ENTRY_FIELD_COUNT_MAX)

++                return -E2BIG;

++

+         if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1))

+                 return log_oom();

+ 

+@@ -108,7 +111,7 @@ static int get_line(JournalImporter *imp

+                 imp->scanned = imp->filled;

+                 if (imp->scanned >= DATA_SIZE_MAX) {

+                         log_error("Entry is bigger than %u bytes.", DATA_SIZE_MAX);

+-                        return -E2BIG;

++                        return -ENOBUFS;

+                 }

+ 

+                 if (imp->passive_fd)

+diff -rup systemd-233/src/basic/journal-importer.h systemd-233-new/src/basic/journal-importer.h

+--- systemd-233/src/basic/journal-importer.h	2017-03-01 13:43:06.000000000 -0800

+@@ -31,6 +31,9 @@

+ #define DATA_SIZE_MAX (1024*1024*768u)

+ #define LINE_CHUNK 8*1024u

+ 

++/* The maximum number of fields in an entry */

++#define ENTRY_FIELD_COUNT_MAX 1024

++

+ struct iovec_wrapper {

+         struct iovec *iovec;

+         size_t size_bytes;

+diff -rup systemd-233/src/journal/journald-native.c systemd-233-new/src/journal/journald-native.c

+--- systemd-233/src/journal/journald-native.c	2017-03-01 13:43:06.000000000 -0800

+@@ -139,6 +139,10 @@ void server_process_native_message(

+                 }

+ 

+                 /* A property follows */

++                if (n > ENTRY_FIELD_COUNT_MAX) {

++                        log_debug("Received an entry that has more than " STRINGIFY(ENTRY_FIELD_COUNT_MAX) " fields, ignoring entry.");

++                        goto finish;

++                }

+ 

+                 /* n existing properties, 1 new, +1 for _TRANSPORT */

+                 if (!GREEDY_REALLOC(iovec, m, n + 2 + N_IOVEC_META_FIELDS + N_IOVEC_OBJECT_FIELDS)) {

+diff -rup systemd-233/src/journal-remote/journal-remote.c systemd-233-new/src/journal-remote/journal-remote.c

+--- systemd-233/src/journal-remote/journal-remote.c	2017-03-01 13:43:06.000000000 -0800

+@@ -527,10 +527,14 @@ static int process_http_upload(

+                         break;

+                 else if (r < 0) {

+                         log_warning("Failed to process data for connection %p", connection);

+-                        if (r == -E2BIG)

++                        if (r == -ENOBUFS)

+                                 return mhd_respondf(connection,

+                                                     r, MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,

+                                                     "Entry is too large, maximum is " STRINGIFY(DATA_SIZE_MAX) " bytes.");

++                        else if (r == -E2BIG)

++                                return mhd_respondf(connection,

++                                                    r, MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,

++                                                    "Entry with more fields than the maximum of " STRINGIFY(ENTRY_FIELD_COUNT_MAX) ".");

+                         else

+                                 return mhd_respondf(connection,

+                                                     r, MHD_HTTP_UNPROCESSABLE_ENTITY,

+@@ -1053,6 +1057,9 @@ static int handle_raw_source(sd_event_so

+                 log_debug("%zu active sources remaining", s->active);

+                 return 0;

+         } else if (r == -E2BIG) {

++                log_notice("Entry with too many fields, skipped");

++                return 1;

++        } else if (r == -ENOBUFS) {

+                 log_notice_errno(E2BIG, "Entry too big, skipped");

+                 return 1;

+         } else if (r == -EAGAIN) {

new file mode 100644

@@ -0,0 +1,60 @@

+From a6aadf4ae0bae185dc4c414d492a4a781c80ffe5 Mon Sep 17 00:00:00 2001

+From: Yu Watanabe <watanabe.yu+github@gmail.com>

+Date: Wed, 8 Aug 2018 15:06:36 +0900

+Subject: [PATCH] journal: fix syslog_parse_identifier()

+

+Fixes #9829.

+---

+ src/journal/journald-syslog.c     |  6 +++---

+ src/journal/test-journal-syslog.c | 10 ++++++++--

+ 2 files changed, 11 insertions(+), 5 deletions(-)

+

+--- a/src/journal/journald-syslog.c

+@@ -212,7 +212,7 @@

+         e = l;

+         l--;

+ 

+-        if (p[l-1] == ']') {

++        if (l > 0 && p[l-1] == ']') {

+                 size_t k = l-1;

+ 

+                 for (;;) {

+@@ -237,8 +237,8 @@

+         if (t)

+                 *identifier = t;

+ 

+-        if (strchr(WHITESPACE, p[e]))

+-                e++;

++        e += strspn(p + e, WHITESPACE);

++

+         *buf = p + e;

+         return e;

+ }

+--- a/src/journal/test-journal-syslog.c

+@@ -23,8 +23,8 @@

+ #include "macro.h"

+ #include "string-util.h"

+ 

+-static void test_syslog_parse_identifier(const char* str,

+-                                         const char *ident, const char*pid, int ret) {

++static void test_syslog_parse_identifier(const char *str,

++                                         const char *ident, const char *pid, int ret) {

+         const char *buf = str;

+         _cleanup_free_ char *ident2 = NULL, *pid2 = NULL;

+         int ret2;

+@@ -39,7 +39,13 @@

+ int main(void) {

+         test_syslog_parse_identifier("pidu[111]: xxx", "pidu", "111", 11);

+         test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, 6);

++        test_syslog_parse_identifier("pidu:  xxx", "pidu", NULL, 7);

+         test_syslog_parse_identifier("pidu xxx", NULL, NULL, 0);

++        test_syslog_parse_identifier(":", "", NULL, 1);

++        test_syslog_parse_identifier(":  ", "", NULL, 3);

++        test_syslog_parse_identifier("pidu:", "pidu", NULL, 5);

++        test_syslog_parse_identifier("pidu: ", "pidu", NULL, 6);

++        test_syslog_parse_identifier("pidu : ", NULL, NULL, 0);

+ 

+         return 0;

+ }

@@ -1,7 +1,7 @@

 Summary:          Systemd-233

 Name:             systemd

 Version:          233

-Release:          17%{?dist}

+Release:          18%{?dist}

 License:          LGPLv2+ and GPLv2+ and MIT

 URL:              http://www.freedesktop.org/wiki/Software/systemd/

 Group:            System Environment/Security

@@ -34,6 +34,9 @@ Patch15:          systemd-233-util-linux-build-failure.patch

 Patch16:          systemd-233-CVE-2018-1049.patch

 Patch17:          systemd-233-CVE-2018-15688.patch

 Patch18:          systemd-233-CVE-2018-15686.patch

+Patch19:          systemd-233-CVE-2018-16864.patch

+Patch20:          systemd-233-CVE-2018-16865.patch

+Patch21:          systemd-233-CVE-2018-16866.patch

 Requires:         Linux-PAM

 Requires:         libcap

@@ -106,6 +109,9 @@ sed -i "/xlocale.h/d" src/basic/parse-util.c

 %patch16 -p1

 %patch17 -p1

 %patch18 -p1

+%patch19 -p1

+%patch20 -p1

+%patch21 -p1

 sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf

@@ -256,6 +262,8 @@ rm -rf %{buildroot}/*

 %files lang -f %{name}.lang

 %changelog

+*    Thu Jan 10 2019 Anish Swaminathan <anishs@vmware.com>  233-18

+-    Fix CVE-2018-16864, CVE-2018-16865, CVE-2018-16866

 *    Thu Jan 03 2019 Anish Swaminathan <anishs@vmware.com>  233-17

 -    Fix CVE-2018-15686

 *    Fri Nov 02 2018 Tapas Kundu <tkundu@vmware.com> 233-16