new file mode 100644

@@ -0,0 +1,341 @@

+diff -rup systemd-228/src/basic/io-util.c systemd-228-new/src/basic/io-util.c

+--- systemd-228/src/basic/io-util.c	2015-11-17 23:59:06.000000000 -0800

+@@ -23,6 +23,7 @@

+ #include <unistd.h>

+ 

+ #include "io-util.h"

++#include "string-util.h"

+ 

+ int flush_fd(int fd) {

+         struct pollfd pollfd = {

+@@ -259,3 +260,20 @@ ssize_t sparse_write(int fd, const void

+ 

+         return q - (const uint8_t*) p;

+ }

++

++char* set_iovec_string_field(struct iovec *iovec, unsigned int *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, unsigned int *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-228/src/basic/io-util.h systemd-228-new/src/basic/io-util.h

+--- systemd-228/src/basic/io-util.h	2015-11-17 23:59:06.000000000 -0800

+@@ -47,6 +47,14 @@ ssize_t sparse_write(int fd, const void

+                 _i->iov_len = strlen(_s);       \

+         } while(false)

+ 

++#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, unsigned int *n_iovec, const char *field, const char *value);

++char* set_iovec_field_free(struct iovec *iovec, unsigned int *n_iovec, const char *field, char *value);

++

+ static inline size_t IOVEC_TOTAL_SIZE(const struct iovec *i, unsigned n) {

+         unsigned j;

+         size_t r = 0;

+diff -rup systemd-228/src/journal/coredump.c systemd-228-new/src/journal/coredump.c

+--- systemd-228/src/journal/coredump.c	2015-11-17 23:59:06.000000000 -0800

+@@ -537,28 +537,16 @@ static int compose_open_fds(pid_t pid, c

+ }

+ 

+ int main(int argc, char* argv[]) {

+-

+-        /* The small core field we allocate on the stack, to keep things simple */

+-        char

+-                *core_pid = NULL, *core_uid = NULL, *core_gid = NULL, *core_signal = NULL,

+-                *core_session = NULL, *core_exe = NULL, *core_comm = NULL, *core_cmdline = NULL,

+-                *core_cgroup = NULL, *core_cwd = NULL, *core_root = NULL, *core_unit = NULL,

+-                *core_slice = NULL;

+-

+-        /* The larger ones we allocate on the heap */

+-        _cleanup_free_ char

+-                *core_timestamp = NULL,  *core_message = NULL, *coredump_data = NULL, *core_owner_uid = NULL,

+-                *core_open_fds = NULL, *core_proc_status = NULL, *core_proc_maps = NULL, *core_proc_limits = NULL,

+-                *core_proc_cgroup = NULL, *core_environ = NULL;

+-

+-        _cleanup_free_ char *exe = NULL, *comm = NULL, *filename = NULL;

++        _cleanup_free_ char *core_timestamp = NULL, *core_owner_uid = NULL, *coredump_data = NULL;

++        _cleanup_free_ char *exe = NULL, *comm = NULL, *filename = NULL, *core_message = NULL;

+         const char *info[_INFO_LEN];

+ 

+         _cleanup_close_ int coredump_fd = -1;

+ 

+         struct iovec iovec[26];

+         uint64_t coredump_size;

+-        int r, j = 0;

++        int r;

++        unsigned n_iovec = 0;

+         uid_t uid, owner_uid;

+         gid_t gid;

+         pid_t pid;

+@@ -645,151 +633,101 @@ int main(int argc, char* argv[]) {

+                         goto finish;

+                 }

+ 

+-                core_unit = strjoina("COREDUMP_UNIT=", t);

+-                free(t);

++                if (!set_iovec_field_free(iovec, &n_iovec, "COREDUMP_UNIT=", t))

++                        return log_oom();

+ 

+         } else if (cg_pid_get_user_unit(pid, &t) >= 0) {

+-                core_unit = strjoina("COREDUMP_USER_UNIT=", t);

+-                free(t);

++                if (!set_iovec_field_free(iovec, &n_iovec, "COREDUMP_USER_UNIT=", t))

++                        return log_oom();

+         }

+ 

+-        if (core_unit)

+-                IOVEC_SET_STRING(iovec[j++], core_unit);

+-

+         /* OK, now we know it's not the journal, hence we can make use

+          * of it now. */

+         log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);

+         log_open();

+ 

+-        core_pid = strjoina("COREDUMP_PID=", info[INFO_PID]);

+-        IOVEC_SET_STRING(iovec[j++], core_pid);

+-

+-        core_uid = strjoina("COREDUMP_UID=", info[INFO_UID]);

+-        IOVEC_SET_STRING(iovec[j++], core_uid);

+-

+-        core_gid = strjoina("COREDUMP_GID=", info[INFO_GID]);

+-        IOVEC_SET_STRING(iovec[j++], core_gid);

+-

+-        core_signal = strjoina("COREDUMP_SIGNAL=", info[INFO_SIGNAL]);

+-        IOVEC_SET_STRING(iovec[j++], core_signal);

++        if (!set_iovec_string_field(iovec, &n_iovec, "COREDUMP_PID=", info[INFO_PID]))

++                return log_oom();

++        if (!set_iovec_string_field(iovec, &n_iovec, "COREDUMP_UID=", info[INFO_UID]))

++                return log_oom();

++        if (!set_iovec_string_field(iovec, &n_iovec, "COREDUMP_GID=", info[INFO_GID]))

++                return log_oom();

++        if (!set_iovec_string_field(iovec, &n_iovec, "COREDUMP_SIGNAL=", info[INFO_SIGNAL]))

++                return log_oom();

+ 

+         if (sd_pid_get_session(pid, &t) >= 0) {

+-                core_session = strjoina("COREDUMP_SESSION=", t);

+-                free(t);

+-

+-                IOVEC_SET_STRING(iovec[j++], core_session);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_SESSION=", t);

+         }

+ 

+         if (sd_pid_get_owner_uid(pid, &owner_uid) >= 0) {

+                 r = asprintf(&core_owner_uid,

+                              "COREDUMP_OWNER_UID=" UID_FMT, owner_uid);

+                 if (r > 0)

+-                        IOVEC_SET_STRING(iovec[j++], core_owner_uid);

++                        IOVEC_SET_STRING(iovec[n_iovec++], core_owner_uid);

+         }

+ 

+         if (sd_pid_get_slice(pid, &t) >= 0) {

+-                core_slice = strjoina("COREDUMP_SLICE=", t);

+-                free(t);

+-

+-                IOVEC_SET_STRING(iovec[j++], core_slice);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_SLICE=", t);

+         }

+ 

+-        if (comm) {

+-                core_comm = strjoina("COREDUMP_COMM=", comm);

+-                IOVEC_SET_STRING(iovec[j++], core_comm);

++        if (comm && !set_iovec_string_field(iovec, &n_iovec, "COREDUMP_COMM=",  comm)) {

++                return log_oom();

+         }

+ 

+-        if (exe) {

+-                core_exe = strjoina("COREDUMP_EXE=", exe);

+-                IOVEC_SET_STRING(iovec[j++], core_exe);

++        if (exe && !set_iovec_string_field(iovec, &n_iovec, "COREDUMP_EXE=", exe)) {

++                return log_oom();

+         }

+ 

+         if (get_process_cmdline(pid, 0, false, &t) >= 0) {

+-                core_cmdline = strjoina("COREDUMP_CMDLINE=", t);

+-                free(t);

+-

+-                IOVEC_SET_STRING(iovec[j++], core_cmdline);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_CMDLINE=", t);

+         }

+ 

+         if (cg_pid_get_path_shifted(pid, NULL, &t) >= 0) {

+-                core_cgroup = strjoina("COREDUMP_CGROUP=", t);

+-                free(t);

+-

+-                IOVEC_SET_STRING(iovec[j++], core_cgroup);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_CGROUP=", t);

+         }

+ 

+         if (compose_open_fds(pid, &t) >= 0) {

+-                core_open_fds = strappend("COREDUMP_OPEN_FDS=", t);

+-                free(t);

+-

+-                if (core_open_fds)

+-                        IOVEC_SET_STRING(iovec[j++], core_open_fds);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_OPEN_FDS=", t);

+         }

+ 

+         p = procfs_file_alloca(pid, "status");

+         if (read_full_file(p, &t, NULL) >= 0) {

+-                core_proc_status = strappend("COREDUMP_PROC_STATUS=", t);

+-                free(t);

+-

+-                if (core_proc_status)

+-                        IOVEC_SET_STRING(iovec[j++], core_proc_status);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_PROC_STATUS=", t);

+         }

+ 

+         p = procfs_file_alloca(pid, "maps");

+         if (read_full_file(p, &t, NULL) >= 0) {

+-                core_proc_maps = strappend("COREDUMP_PROC_MAPS=", t);

+-                free(t);

+-

+-                if (core_proc_maps)

+-                        IOVEC_SET_STRING(iovec[j++], core_proc_maps);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_PROC_MAPS=", t);

+         }

+ 

+         p = procfs_file_alloca(pid, "limits");

+         if (read_full_file(p, &t, NULL) >= 0) {

+-                core_proc_limits = strappend("COREDUMP_PROC_LIMITS=", t);

+-                free(t);

+-

+-                if (core_proc_limits)

+-                        IOVEC_SET_STRING(iovec[j++], core_proc_limits);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_PROC_LIMITS=", t);

+         }

+ 

+         p = procfs_file_alloca(pid, "cgroup");

+         if (read_full_file(p, &t, NULL) >=0) {

+-                core_proc_cgroup = strappend("COREDUMP_PROC_CGROUP=", t);

+-                free(t);

+-

+-                if (core_proc_cgroup)

+-                        IOVEC_SET_STRING(iovec[j++], core_proc_cgroup);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_PROC_CGROUP=", t);

+         }

+ 

+         if (get_process_cwd(pid, &t) >= 0) {

+-                core_cwd = strjoina("COREDUMP_CWD=", t);

+-                free(t);

+-

+-                IOVEC_SET_STRING(iovec[j++], core_cwd);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_CWD=", t);

+         }

+ 

+         if (get_process_root(pid, &t) >= 0) {

+-                core_root = strjoina("COREDUMP_ROOT=", t);

+-                free(t);

+-

+-                IOVEC_SET_STRING(iovec[j++], core_root);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_ROOT=", t);

+         }

+ 

+         if (get_process_environ(pid, &t) >= 0) {

+-                core_environ = strappend("COREDUMP_ENVIRON=", t);

+-                free(t);

+-

+-                if (core_environ)

+-                        IOVEC_SET_STRING(iovec[j++], core_environ);

++                set_iovec_field_free(iovec, &n_iovec, "COREDUMP_ENVIRON=", t);

+         }

+ 

+         core_timestamp = strjoin("COREDUMP_TIMESTAMP=", info[INFO_TIMESTAMP], "000000", NULL);

+         if (core_timestamp)

+-                IOVEC_SET_STRING(iovec[j++], core_timestamp);

++                IOVEC_SET_STRING(iovec[n_iovec++], core_timestamp);

+ 

+-        IOVEC_SET_STRING(iovec[j++], "MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1");

+-        IOVEC_SET_STRING(iovec[j++], "PRIORITY=2");

++        IOVEC_SET_STRING(iovec[n_iovec++], "MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1");

++        IOVEC_SET_STRING(iovec[n_iovec++], "PRIORITY=2");

+ 

+         /* Vacuum before we write anything again */

+         coredump_vacuum(-1, arg_keep_free, arg_max_use);

+@@ -811,7 +749,7 @@ int main(int argc, char* argv[]) {

+                 const char *coredump_filename;

+ 

+                 coredump_filename = strjoina("COREDUMP_FILENAME=", filename);

+-                IOVEC_SET_STRING(iovec[j++], coredump_filename);

++                IOVEC_SET_STRING(iovec[n_iovec++], coredump_filename);

+         }

+ 

+         /* Vacuum again, but exclude the coredump we just created */

+@@ -849,7 +787,7 @@ int main(int argc, char* argv[]) {

+ log:

+         core_message = strjoin("MESSAGE=Process ", info[INFO_PID], " (", comm, ") of user ", info[INFO_UID], " dumped core.", NULL);

+         if (core_message)

+-                IOVEC_SET_STRING(iovec[j++], core_message);

++                IOVEC_SET_STRING(iovec[n_iovec++], core_message);

+ 

+         /* Optionally store the entire coredump in the journal */

+         if (IN_SET(arg_storage, COREDUMP_STORAGE_JOURNAL, COREDUMP_STORAGE_BOTH) &&

+@@ -860,13 +798,13 @@ log:

+ 

+                 r = allocate_journal_field(coredump_fd, (size_t) coredump_size, &coredump_data, &sz);

+                 if (r >= 0) {

+-                        iovec[j].iov_base = coredump_data;

+-                        iovec[j].iov_len = sz;

+-                        j++;

++                        iovec[n_iovec].iov_base = coredump_data;

++                        iovec[n_iovec].iov_len = sz;

++                        n_iovec++;

+                 }

+         }

+ 

+-        r = sd_journal_sendv(iovec, j);

++        r = sd_journal_sendv(iovec, n_iovec);

+         if (r < 0)

+                 log_error_errno(r, "Failed to log coredump: %m");

+ 

+diff -rup systemd-228/src/journal/journald-server.c systemd-228-new/src/journal/journald-server.c

+--- systemd-228/src/journal/journald-server.c	2015-11-17 23:59:06.000000000 -0800

+@@ -579,6 +579,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;

+@@ -629,9 +630,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);

+@@ -757,9 +758,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

new file mode 100644

@@ -0,0 +1,117 @@

+From 4489ac6683386805742f7ee678cb8580d669556b Mon Sep 17 00:00:00 2001

+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

+Date: Wed, 5 Dec 2018 22:45:02 +0100

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

+---

+ src/journal/journald-native.c | 5 +++++

+ src/shared/journal-importer.h | 3 +++

+ 2 files changed, 8 insertions(+)

+

+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

+Date: Fri, 7 Dec 2018 10:48:10 +0100

+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).

+---

+ src/journal-remote/journal-remote-main.c | 7 +++++--

+ src/journal-remote/journal-remote.c      | 3 +++

+ src/shared/journal-importer.c            | 5 ++++-

+ 3 files changed, 12 insertions(+), 3 deletions(-)

+

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

+@@ -138,6 +138,10 @@

+                 }

+ 

+                 /* 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)) {

+--- a/src/journal/journal-file.h

+@@ -160,6 +160,9 @@

+  * files without adding too many zeros. */

+ #define OFSfmt "%06"PRIx64

+ 

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

++#define ENTRY_FIELD_COUNT_MAX 1024

++

+ static inline bool VALID_REALTIME(uint64_t u) {

+         /* This considers timestamps until the year 3112 valid. That should be plenty room... */

+         return u > 0 && u < (1ULL << 55);

+

+--- a/src/journal-remote/journal-remote-parse.c

+@@ -109,7 +109,7 @@

+                 source->scanned = source->filled;

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

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

+-                        return -E2BIG;

++                        return -ENOBUFS;

+                 }

+

+                 if (source->passive_fd)

+--- a/src/journal-remote/journal-remote.c

+@@ -526,11 +526,18 @@

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

+                                                     MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,

+                                                     "Entry is too large, maximum is %u bytes.\n",

+                                                     DATA_SIZE_MAX);

++

++                        else if (r == -E2BIG)

++                                return mhd_respondf(connection,

++                                                    MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,

++                                                    "Entry with more fields than the maximum of %u\n",

++                                                    ENTRY_FIELD_COUNT_MAX);

++

+                         else

+                                 return mhd_respondf(connection,

+                                                     MHD_HTTP_UNPROCESSABLE_ENTITY,

+@@ -1056,6 +1063,9 @@

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

+--- a/src/journal-remote/journal-remote-write.c

+@@ -21,6 +21,9 @@

+ #include "journal-remote.h"

+

+ 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();

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-228

 Name:             systemd

 Version:          228

-Release:          49%{?dist}

+Release:          50%{?dist}

 License:          LGPLv2+ and GPLv2+ and MIT

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

 Group:            System Environment/Security

@@ -46,8 +46,11 @@ Patch28:          systemd-228-link-disabled-nullptr-fix.patch

 Patch29:          systemd-228-CVE-2017-15908-dns-pkt-loop-fix.patch

 Patch30:          systemd-228-CVE-2017-18078.patch

 Patch31:          systemd-228-CVE-2018-1049.patch

-Patch32:          systemd-228-CVE-2018-15688.patch 

-Patch33:          systemd-228-CVE-2018-15686.patch 

+Patch32:          systemd-228-CVE-2018-15688.patch

+Patch33:          systemd-228-CVE-2018-15686.patch

+Patch34:          systemd-228-CVE-2018-16864.patch

+Patch35:          systemd-228-CVE-2018-16865.patch

+Patch36:          systemd-228-CVE-2018-16866.patch

 Requires:         Linux-PAM

 Requires:         libcap

 Requires:         xz

@@ -115,6 +118,9 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")

 %patch31 -p1

 %patch32 -p1

 %patch33 -p1

+%patch34 -p1

+%patch35 -p1

+%patch36 -p1

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

 %build

@@ -255,6 +261,8 @@ rm -rf %{buildroot}/*

 %changelog

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

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

 *    Fri Jan 04 2019 Anish Swaminathan <anishs@vmware.com> 228-49

 -    Fix CVE-2018-15686

 *    Fri Nov 02 2018 Tapas Kundu <tkundu@vmware.com> 228-48