diff --git a/SOURCES/0760-unit-fix-potential-use-of-cgroup_path-after-free-whe.patch b/SOURCES/0760-unit-fix-potential-use-of-cgroup_path-after-free-whe.patch
new file mode 100644
index 0000000..afe256c
--- /dev/null
+++ b/SOURCES/0760-unit-fix-potential-use-of-cgroup_path-after-free-whe.patch
@@ -0,0 +1,39 @@
+From 97c5fed4ddbd627c046fbf946474270182bdda6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Sat, 23 Nov 2019 13:37:02 +0100
+Subject: [PATCH] unit: fix potential use of cgroup_path after free() when
+ freeing unit
+
+Resolves: #1778083
+---
+ src/core/cgroup.c | 3 +--
+ src/core/unit.c | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/cgroup.c b/src/core/cgroup.c
+index 0779fa5552..f598fdd1e7 100644
+--- a/src/core/cgroup.c
++++ b/src/core/cgroup.c
+@@ -873,8 +873,7 @@ void unit_destroy_cgroup_if_empty(Unit *u) {
+
+ hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
+
+- free(u->cgroup_path);
+- u->cgroup_path = NULL;
++ u->cgroup_path = mfree(u->cgroup_path);
+ u->cgroup_realized = false;
+ u->cgroup_realized_mask = 0;
+ }
+diff --git a/src/core/unit.c b/src/core/unit.c
+index def36a0930..cabbf8056e 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -514,7 +514,7 @@ void unit_free(Unit *u) {
+
+ if (u->cgroup_path) {
+ hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
+- free(u->cgroup_path);
++ u->cgroup_path = mfree(u->cgroup_path);
+ }
+
+ set_remove(u->manager->failed_units, u);
diff --git a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch b/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
deleted file mode 100644
index c42f0b6..0000000
--- a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c49c37d5e26bf71a97d5194d390f80d3e71758e1 Mon Sep 17 00:00:00 2001
-From: systemd team <systemd-maint@redhat.com>
-Date: Tue, 23 Apr 2019 10:46:19 -0300
-Subject: [PATCH] Update kernel-install script by backporting fedora patches
-
----
- src/kernel-install/kernel-install | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
-index f1c74de..d860701 100755
---- a/src/kernel-install/kernel-install
-+++ b/src/kernel-install/kernel-install
-@@ -73,23 +73,27 @@ KERNEL_IMAGE="$2"
-
- if [[ -x /sbin/new-kernel-pkg ]]; then
- KERNEL_DIR="${KERNEL_IMAGE%/*}"
-- if [[ "${KERNEL_DIR}" != "/boot" ]]; then
-- for i in \
-- "$KERNEL_IMAGE" \
-- "$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac" \
-- "$KERNEL_DIR"/System.map \
-- "$KERNEL_DIR"/config \
-- "$KERNEL_DIR"/zImage.stub \
-- "$KERNEL_DIR"/dtb \
-- ; do
-- [[ -e "$i" ]] || continue
-- cp -a "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
-- done
-- fi
-
- [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
- case "$COMMAND" in
- add)
-+ if [[ "${KERNEL_DIR}" != "/boot" ]]; then
-+ for i in \
-+ "$KERNEL_IMAGE" \
-+ "$KERNEL_DIR"/System.map \
-+ "$KERNEL_DIR"/config \
-+ "$KERNEL_DIR"/zImage.stub \
-+ "$KERNEL_DIR"/dtb \
-+ ; do
-+ [[ -e "$i" ]] || continue
-+ cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
-+ done
-+ # hmac is .vmlinuz-<version>.hmac so needs a special treatment
-+ i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
-+ if [[ -e "$i" ]]; then
-+ cp -aT "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
-+ fi
-+ fi
- /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $?
- /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $?
- /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $?
---
-1.8.3.1
-
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 895dfa7..918f9fc 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 219
-Release: 67%{?dist}.2
+Release: 67%{?dist}.3
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -798,8 +798,7 @@ Patch0756: 0756-pid1-properly-remove-references-to-the-unit-from-gc-.patch
Patch0757: 0757-service-relax-PID-file-symlink-chain-checks-a-bit-81.patch
Patch0758: 0758-path-util-fix-more-path_is_mount-e792e890f-fallout.patch
Patch0759: 0759-core-exclude-.slice-units-from-systemctl-isolate.patch
-
-Patch9999: 9999-Update-kernel-install-script-by-backporting-fedora-p.patch
+Patch0760: 0760-unit-fix-potential-use-of-cgroup_path-after-free-whe.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
@@ -1776,6 +1775,9 @@ fi
%{_mandir}/man8/systemd-resolved.*
%changelog
+* Fri Nov 29 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-67.3
+- unit: fix potential use of cgroup_path after free() when freeing unit (#1778083)
+
* Thu Sep 19 2019 David Tardon <dtardon@redhat.com> - 219-67.2
- core: exclude .slice units from "systemctl isolate" (#1751130)