diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-18 00:02:54 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-18 00:02:54 +0000 |
| commit | d14a25fc4f65ae3d6e62f4668e9cb88d74834255 (patch) | |
| tree | 7c4f618283e9b502f0d9cfb5059ce38daa7738be /extra/systemd | |
| parent | 9a940818cc3edb82afac4d73a6474e6e3374f987 (diff) | |
Sun Mar 18 00:02:53 UTC 2012
Diffstat (limited to 'extra/systemd')
| -rw-r--r-- | extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch | 32 | ||||
| -rw-r--r-- | extra/systemd/PKGBUILD | 20 |
2 files changed, 42 insertions, 10 deletions
diff --git a/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch new file mode 100644 index 000000000..7ac9251b3 --- /dev/null +++ b/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch @@ -0,0 +1,32 @@ +From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 +From: Michal Schmidt <mschmidt@redhat.com> +Date: Fri, 2 Mar 2012 10:39:10 +0100 +Subject: [PATCH] util: never follow symlinks in rm_rf_children() + +The function checks if the entry is a directory before recursing, but +there is a window between the check and the open, during which the +directory could be replaced with a symlink. + +CVE-2012-1174 +https://bugzilla.redhat.com/show_bug.cgi?id=803358 +--- + src/util.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index 20cbc2b..dfc1dc6 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { + if (is_dir) { + int subdir_fd; + +- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { ++ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); ++ if (subdir_fd < 0) { + if (ret == 0 && errno != ENOENT) + ret = -errno; + continue; +-- +1.7.9.4 + diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD index 9e77b3e95..d1f60b49c 100644 --- a/extra/systemd/PKGBUILD +++ b/extra/systemd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153036 2012-03-11 15:14:05Z heftig $ +# $Id: PKGBUILD 153641 2012-03-17 02:44:42Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgbase=systemd pkgname=('systemd' 'libsystemd') -pkgver=43 -pkgrel=4 +pkgver=44 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') @@ -12,17 +12,17 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release" "cpp-compat.patch") -md5sums=('446cc6db7625617af67e2d8e5f503a49' + "os-release" + 0001-util-never-follow-symlinks-in-rm_rf_children.patch) +md5sums=('11f44ff74c87850064e4351518bcff17' '752636def0db3c03f121f8b4f44a63cd' - '414968aa314ced0b0ab4b2207e46aa69') + 'b5863d6d4b47e2b5bda8eb57bde0d327') build() { cd "$pkgname-$pkgver" - - # Fix C++ compile error when including sd-login.h - # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514 - patch -p1 -i ../cpp-compat.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=803358 + patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ |