Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=598af5ec87bda06e847b4807f28fe6a6d83b6b99
commit 598af5ec87bda06e847b4807f28fe6a6d83b6b99 Author: crazy <[email protected]> Date: Sun Dec 6 02:51:30 2015 +0100 udisks-1.0.5-1-x86_64 * version bump diff --git a/source/xapps/udisks/CVE-2014-0004.patch b/source/xapps/udisks/CVE-2014-0004.patch deleted file mode 100644 index 6b7483e..0000000 --- a/source/xapps/udisks/CVE-2014-0004.patch +++ /dev/null @@ -1,87 +0,0 @@ -From ebf61ed8471a45cf8bce7231de00cb1bbc140708 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <[email protected]> -Date: Wed, 5 Mar 2014 14:07:44 +0100 -Subject: [PATCH] Fix buffer overflow in mount path parsing - -In the mount monitor we parse mount points from /proc/self/mountinfo. Ensure -that we don't overflow the buffers on platforms where mount paths could be -longer than PATH_MAX (unknown if that can actually happen), as at least the -mount paths for hotpluggable devices are somewhat user-controlled. - -Thanks to Florian Weimer for discovering this bug, and to David Zeuthen -for his initial patch! - -CVE-2014-0004 ---- - src/mount-monitor.c | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/src/mount-monitor.c b/src/mount-monitor.c -index d541deb..573a69c 100644 ---- a/src/mount-monitor.c -+++ b/src/mount-monitor.c -@@ -39,6 +39,11 @@ - #include "mount.h" - #include "private.h" - -+/* build a %Ns format string macro with N == PATH_MAX */ -+#define xstr(s) str(s) -+#define str(s) #s -+#define PATH_MAX_FMT "%" xstr(PATH_MAX) "s" -+ - /*--------------------------------------------------------------------------------------------------------------*/ - - enum -@@ -320,8 +325,8 @@ mount_monitor_ensure (MountMonitor *monitor) - guint mount_id; - guint parent_id; - guint major, minor; -- gchar encoded_root[PATH_MAX]; -- gchar encoded_mount_point[PATH_MAX]; -+ gchar encoded_root[PATH_MAX + 1]; -+ gchar encoded_mount_point[PATH_MAX + 1]; - gchar *mount_point; - dev_t dev; - -@@ -329,7 +334,7 @@ mount_monitor_ensure (MountMonitor *monitor) - continue; - - if (sscanf (lines[n], -- "%d %d %d:%d %s %s", -+ "%d %d %d:%d " PATH_MAX_FMT " " PATH_MAX_FMT, - &mount_id, - &parent_id, - &major, -@@ -340,6 +345,8 @@ mount_monitor_ensure (MountMonitor *monitor) - g_warning ("Error parsing line '%s'", lines[n]); - continue; - } -+ encoded_root[sizeof encoded_root - 1] = '\0'; -+ encoded_mount_point[sizeof encoded_mount_point - 1] = '\0'; - - /* ignore mounts where only a subtree of a filesystem is mounted */ - if (g_strcmp0 (encoded_root, "/") != 0) -@@ -358,15 +365,17 @@ mount_monitor_ensure (MountMonitor *monitor) - sep = strstr (lines[n], " - "); - if (sep != NULL) - { -- gchar fstype[PATH_MAX]; -- gchar mount_source[PATH_MAX]; -+ gchar fstype[PATH_MAX + 1]; -+ gchar mount_source[PATH_MAX + 1]; - struct stat statbuf; - -- if (sscanf (sep + 3, "%s %s", fstype, mount_source) != 2) -+ if (sscanf (sep + 3, PATH_MAX_FMT " " PATH_MAX_FMT, fstype, mount_source) != 2) - { - g_warning ("Error parsing things past - for '%s'", lines[n]); - continue; - } -+ fstype[sizeof fstype - 1] = '\0'; -+ mount_source[sizeof mount_source - 1] = '\0'; - - if (g_strcmp0 (fstype, "btrfs") != 0) - continue; --- -1.9.0 - diff --git a/source/xapps/udisks/FrugalBuild b/source/xapps/udisks/FrugalBuild index f3c6d9d..e2d4802 100644 --- a/source/xapps/udisks/FrugalBuild +++ b/source/xapps/udisks/FrugalBuild @@ -1,11 +1,9 @@ # Compiling time: 0.07 SBU # Maintainer: bouleetbil <[email protected]> -options+=('asneeded') - pkgname=udisks -pkgver=1.0.4 -pkgrel=9 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Storage Management Service" url="http://www.freedesktop.org/wiki/Software/udisks"; depends=('dbus-glib' 'polkit' 'parted>=3.1-2' 'lvm2>=2.02.96' \ @@ -17,21 +15,13 @@ groups=('xapps') archs=('i686' 'x86_64') up2date="Flasttar http://hal.freedesktop.org/releases/"; source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ - udisks-1.0.4-neuter-stdout-and-stderr.patch \ udisks-1.0.4-drop-pci-db.patch \ udisks_fix_build_with_glibc220.patch) -sha1sums=('10d2acfd6e6ff4c8d9d962af1fb1856a885e3219' \ - 'd97bccf46a78f2e2c493fa6f90195ffa9985db90' \ +sha1sums=('cdc254579a32a6c7b9e94758bb55d544bb807bf5' \ '85121f859c0a13e744f34948826a26f6527f5388' \ - 'ac8acfc97aadb0142d19481b072e921ea85e763b') + 'ac8acfc97aadb0142d19481b072e921ea85e763b') replaces=('devicekit-disks') - -# FSA fix *** -source=(${source[@]} CVE-2014-0004.patch) -sha1sums=(${sha1sums[@]} '714572ee4083a64829fb96d5e070eb2088c89538') -# *********** - build() { Fbuild diff --git a/source/xapps/udisks/udisks-1.0.4-neuter-stdout-and-stderr.patch b/source/xapps/udisks/udisks-1.0.4-neuter-stdout-and-stderr.patch deleted file mode 100644 index 95cceb9..0000000 --- a/source/xapps/udisks/udisks-1.0.4-neuter-stdout-and-stderr.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 072654b3ea2591e05cfbe80c06a00858e63f1f1a Mon Sep 17 00:00:00 2001 -From: David Zeuthen <[email protected]> -Date: Tue, 18 Oct 2011 12:19:22 -0400 -Subject: [PATCH] udisks-daemon: Add --no-debug option and use this for D-Bus - activation - -Signed-off-by: David Zeuthen <[email protected]> ---- - data/org.freedesktop.UDisks.service.in | 2 +- - src/main.c | 28 ++++++++++++++++++++++++---- - 2 files changed, 25 insertions(+), 5 deletions(-) - -diff --git a/data/org.freedesktop.UDisks.service.in b/data/org.freedesktop.UDisks.service.in -index b3606a6..bc3542a 100644 ---- a/data/org.freedesktop.UDisks.service.in -+++ b/data/org.freedesktop.UDisks.service.in -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=org.freedesktop.UDisks --Exec=@libexecdir@/udisks-daemon -+Exec=@libexecdir@/udisks-daemon --no-debug - User=root - -diff --git a/src/main.c b/src/main.c -index 318db27..6e220b1 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -141,12 +141,13 @@ main (int argc, - static char *helper_dir = NULL; - char *path; - int ret; -- static gboolean replace; -+ static gboolean replace = FALSE; -+ static gboolean no_debug = FALSE; - static GOptionEntry entries[] = - { -- { "replace", 0, 0, G_OPTION_ARG_NONE, &replace, "Replace existing daemon", NULL }, -- { "helper-dir", 0, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_STRING, -- &helper_dir, "Directory for helper tools", NULL }, -+ { "no-debug", 'n', 0, G_OPTION_ARG_NONE, &no_debug, "Don't print debug information", NULL }, -+ { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace, "Replace existing daemon", NULL }, -+ { "helper-dir", 0, 0, G_OPTION_ARG_FILENAME, &helper_dir, "Directory for helper tools", NULL }, - { NULL } }; - - PROFILE ("main(): start"); -@@ -181,6 +182,25 @@ main (int argc, - g_option_context_parse (context, &argc, &argv, NULL); - g_option_context_free (context); - -+ /* If --no-debug is requested don't clutter stdout/stderr etc. -+ */ -+ if (no_debug) -+ { -+ gint dev_null_fd; -+ dev_null_fd = open ("/dev/null", O_RDWR); -+ if (dev_null_fd >= 0) -+ { -+ dup2 (dev_null_fd, STDIN_FILENO); -+ dup2 (dev_null_fd, STDOUT_FILENO); -+ dup2 (dev_null_fd, STDERR_FILENO); -+ close (dev_null_fd); -+ } -+ else -+ { -+ g_warning ("Error opening /dev/null: %m"); -+ } -+ } -+ - /* run with a controlled path */ - if (helper_dir != NULL) - path = g_strdup_printf ("%s:" PACKAGE_LIBEXEC_DIR ":/sbin:/bin:/usr/sbin:/usr/bin", helper_dir); --- -1.7.6.4 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
