new file mode 100644

@@ -0,0 +1,77 @@

+commit e7d54bf58789545a9eb0b3964233defa0b007318

+Author: Anchor Cat <githubanchorcat@anchor.net.au>

+Date:   Wed May 10 21:23:58 2017 +1000

+

+    automount: ack automount requests even when already mounted (#5916)

+

+    If a process accesses an autofs filesystem while systemd is in the

+    middle of starting the mount unit on top of it, it is possible for the

+    autofs_ptype_missing_direct request from the kernel to be received after

+    the mount unit has been fully started:

+

+      systemd forks and execs mount             ...

+                ...                     access autofs, blocks

+      mount exits                               ...

+      systemd receives SIGCHLD                  ...

+                ...                     kernel sends request

+      systemd receives request                  ...

+

+    systemd needs to respond to this request, otherwise the kernel will

+    continue to block access to the mount point.

+

+diff --git a/src/core/automount.c b/src/core/automount.c

+index 85b7b4e..180aecd 100644

+--- a/src/core/automount.c

+@@ -701,8 +701,9 @@ static int automount_start_expire(Automount *a) {

+         return 0;

+ }

+ 

+-static void automount_enter_runnning(Automount *a) {

++static void automount_enter_running(Automount *a) {

+         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;

++        Unit *trigger;

+         struct stat st;

+         int r;

+ 

+@@ -724,15 +725,23 @@ static void automount_enter_runnning(Automount *a) {

+                 log_unit_warning_errno(UNIT(a), errno, "Failed to stat automount point: %m");

+                 goto fail;

+         }

+-

+-        if (!S_ISDIR(st.st_mode) || st.st_dev != a->dev_id)

++        /* The mount unit may have been explicitly started before we got the

++         * autofs request. Ack it to unblock anything waiting on the mount point. */

++        if (!S_ISDIR(st.st_mode) || st.st_dev != a->dev_id) {

+                 log_unit_info(UNIT(a), "Automount point already active?");

+-        else {

+-                r = manager_add_job(UNIT(a)->manager, JOB_START, UNIT_TRIGGER(UNIT(a)), JOB_REPLACE, &error, NULL);

+-                if (r < 0) {

+-                        log_unit_warning(UNIT(a), "Failed to queue mount startup job: %s", bus_error_message(&error, r));

+-                        goto fail;

+-                }

++                automount_send_ready(a, a->tokens, 0);

++                return;

++        }

++

++        trigger = UNIT_TRIGGER(UNIT(a));

++        if (!trigger) {

++                log_unit_error(UNIT(a), "Unit to trigger vanished.");

++                goto fail;

++        }

++        r = manager_add_job(UNIT(a)->manager, JOB_START, trigger, JOB_REPLACE, &error, NULL);

++        if (r < 0) {

++                log_unit_warning(UNIT(a), "Failed to queue mount startup job: %s", bus_error_message(&error, r));

++                goto fail;

+         }

+ 

+         automount_set_state(a, AUTOMOUNT_RUNNING);

+@@ -941,7 +950,7 @@ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo

+                         goto fail;

+                 }

+ 

+-                automount_enter_runnning(a);

++                automount_enter_running(a);

+                 break;

+ 

+         case autofs_ptype_expire_direct:

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

 Summary:          Systemd-228

 Name:             systemd

 Version:          228

-Release:          46%{?dist}

+Release:          47%{?dist}

 License:          LGPLv2+ and GPLv2+ and MIT

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

 Group:            System Environment/Security

@@ -45,6 +45,7 @@ Patch27:          systemd-228-resolved-null-deferencing-fix.patch

 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

 Requires:         Linux-PAM

 Requires:         libcap

 Requires:         xz

@@ -109,6 +110,7 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")

 %patch28 -p1

 %patch29 -p1

 %patch30 -p1

+%patch31 -p1

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

 %build

@@ -249,6 +251,8 @@ rm -rf %{buildroot}/*

 %changelog

+*    Mon Jul 23 2018 Ankit Jain <ankitja@vmware.com>  228-47

+-    Fix CVE-2018-1049.

 *    Thu Jun 28 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 228-46

 -    Automatically load rdrand-rng kernel module on every boot.

 *    Thu Mar 15 2018 Xiaolin Li <xiaolinl@vmware.com>  228-45