sys-apps/systemd: Backport fix for CVE-2015-7510

Bug: https://bugs.gentoo.org/566716

Package-Manager: portage-2.2.25_p7

diff --git a/sys-apps/systemd/files/CVE-2015-7510.patch b/sys-apps/systemd/files/CVE-2015-7510.patch
new file mode 100644 (file)
index 0000000..088adbb
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2015-7510.patch
@@ -0,0 +1,37 @@
+From cb31827d62066a04b02111df3052949fda4b6888 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Mon, 23 Nov 2015 13:59:43 -0500
+Subject: [PATCH] nss-mymachines: do not allow overlong machine names
+
+https://github.com/systemd/systemd/issues/2002
+---
+ src/nss-mymachines/nss-mymachines.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
+index 969fa96..c98a959 100644
+--- a/src/nss-mymachines/nss-mymachines.c
++++ b/src/nss-mymachines/nss-mymachines.c
+@@ -416,6 +416,9 @@ enum nss_status _nss_mymachines_getpwnam_r(
+         if (!e || e == p)
+                 goto not_found;
+ 
++        if (e - p > HOST_NAME_MAX - 1) /* -1 for the last dash */
++                goto not_found;
++
+         r = parse_uid(e + 1, &uid);
+         if (r < 0)
+                 goto not_found;
+@@ -573,6 +576,9 @@ enum nss_status _nss_mymachines_getgrnam_r(
+         if (!e || e == p)
+                 goto not_found;
+ 
++        if (e - p > HOST_NAME_MAX - 1)  /* -1 for the last dash */
++                goto not_found;
++
+         r = parse_gid(e + 1, &gid);
+         if (r < 0)
+                 goto not_found;
+-- 
+2.6.3
+

diff --git a/sys-apps/systemd/systemd-226-r1.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-226-r1.ebuild
rename to sys-apps/systemd/systemd-226-r2.ebuild
index 9a7bc968ace42c2f67362844232d0e386bdb3862..10471ac5466f6130c48b4197ab5ee34437c22cce 100644 (file)
--- a/sys-apps/systemd/systemd-226-r1.ebuild
+++ b/sys-apps/systemd/systemd-226-r2.ebuild
@@ -146,6 +146,7 @@ src_prepare() {
        sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
        epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
        epatch "${FILESDIR}/226-noclean-tmp.patch"
+       epatch "${FILESDIR}/CVE-2015-7510.patch"
        epatch_user
        eautoreconf
 }

diff --git a/sys-apps/systemd/systemd-228.ebuild b/sys-apps/systemd/systemd-228-r1.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-228.ebuild
rename to sys-apps/systemd/systemd-228-r1.ebuild
index 440c35f86df052f4f67c7543843a675af6a0f220..1ca11dabc10e564547ec32b3b36290de2a757f1b 100644 (file)
--- a/sys-apps/systemd/systemd-228.ebuild
+++ b/sys-apps/systemd/systemd-228-r1.ebuild
@@ -146,6 +146,7 @@ src_prepare() {
        sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
        epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
        epatch "${FILESDIR}/228-noclean-tmp.patch"
+       epatch "${FILESDIR}/CVE-2015-7510.patch"
        epatch_user
        eautoreconf
 }