[abrt/f15] fixed 2 segvs rhbz#737961 and /var/run/privs rhbz#725974
Nikola Pajkovsky
npajkovs at fedoraproject.org
Tue Sep 13 15:50:09 UTC 2011
commit 5dda991bbb8c12220e12aeae1704cc69123152f1
Author: Nikola Pajkovsky <npajkovs at redhat.com>
Date: Tue Sep 13 17:46:29 2011 +0200
fixed 2 segvs rhbz#737961 and /var/run/privs rhbz#725974
Signed-off-by: Nikola Pajkovsky <npajkovs at redhat.com>
0001-Fix-free-space-checking.patch | 35 ++++++++++++++++++++
...-a-save-package-data-Fix-NULL-dereference.patch | 27 +++++++++++++++
abrt.spec | 15 +++++++--
3 files changed, 74 insertions(+), 3 deletions(-)
---
diff --git a/0001-Fix-free-space-checking.patch b/0001-Fix-free-space-checking.patch
new file mode 100644
index 0000000..243432b
--- /dev/null
+++ b/0001-Fix-free-space-checking.patch
@@ -0,0 +1,35 @@
+From e91b22a9654bf9912f3f88c917773a96ff7733a3 Mon Sep 17 00:00:00 2001
+Message-Id: <e91b22a9654bf9912f3f88c917773a96ff7733a3.1315927723.git.npajkovs at redhat.com>
+From: Martin Milata <mmilata at redhat.com>
+Date: Thu, 8 Sep 2011 16:29:01 +0200
+Subject: [PATCH] Fix free space checking
+
+The g_settings_dump_location was freed before it was passed to the free
+space check, thus preventing it from working.
+---
+ src/daemon/abrt-server.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
+index 983706e..330f85f 100644
+--- a/src/daemon/abrt-server.c
++++ b/src/daemon/abrt-server.c
+@@ -143,7 +143,6 @@ static int create_debug_dump()
+
+ /* Trim old crash dumps if necessary */
+ load_abrt_conf();
+- free_abrt_conf_data(); /* can do this because we need only g_settings_nMaxCrashReportsSize */
+ if (g_settings_nMaxCrashReportsSize > 0)
+ {
+ /* x1.25 and round up to 64m: go a bit up, so that usual in-daemon trimming
+@@ -154,6 +153,7 @@ static int create_debug_dump()
+ check_free_space(maxsize, g_settings_dump_location);
+ trim_debug_dumps(g_settings_dump_location, maxsize * (double)(1024*1024), path);
+ }
++ free_abrt_conf_data();
+
+ free(path);
+
+--
+1.7.7.rc0.70.g82660
+
diff --git a/0001-a-a-save-package-data-Fix-NULL-dereference.patch b/0001-a-a-save-package-data-Fix-NULL-dereference.patch
new file mode 100644
index 0000000..16fcba5
--- /dev/null
+++ b/0001-a-a-save-package-data-Fix-NULL-dereference.patch
@@ -0,0 +1,27 @@
+From d2572a98f41df96534f41062b0020ee6a10047ea Mon Sep 17 00:00:00 2001
+Message-Id: <d2572a98f41df96534f41062b0020ee6a10047ea.1315927751.git.npajkovs at redhat.com>
+From: Martin Milata <mmilata at redhat.com>
+Date: Tue, 26 Jul 2011 16:49:28 +0200
+Subject: [PATCH] a-a-save-package-data: Fix NULL dereference
+
+Fixes #324.
+---
+ src/daemon/abrt-action-save-package-data.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c
+index d37a05d..ddcf4ac 100644
+--- a/src/daemon/abrt-action-save-package-data.c
++++ b/src/daemon/abrt-action-save-package-data.c
+@@ -160,7 +160,7 @@ static char *get_argv1_if_full_path(const char* cmdline)
+ * with '/', it is not a full path to script
+ * and we can't use it to determine the package name
+ */
+- if (*argv1 != '/')
++ if (argv1 == NULL || *argv1 != '/')
+ return NULL;
+
+ /* good, it has "/foo/bar" form, return it */
+--
+1.7.7.rc0.70.g82660
+
diff --git a/abrt.spec b/abrt.spec
index 97c1f69..3d154cf 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -10,7 +10,7 @@
Summary: Automatic bug detection and reporting tool
Name: abrt
Version: 2.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://fedorahosted.org/abrt/
@@ -25,6 +25,8 @@ Patch5: 0004-Revert-Merge-branch-daemon-dump-location.patch
Patch6: 0005-abrt-server-ccpp_hook-enlarge-spool-dir-pruning-thre.patch
Patch7: 0006-rhbz-671354-RFE-Configurable-core-dump-location.patch
Patch8: 0007-abrtd-pipe-post-create-output-to-log.-Closes-bz-6991.patch
+Patch9: 0001-a-a-save-package-data-Fix-NULL-dereference.patch
+Patch10: 0001-Fix-free-space-checking.patch
BuildRequires: dbus-devel
BuildRequires: gtk2-devel
BuildRequires: curl-devel
@@ -222,7 +224,8 @@ Virtual package to make easy default installation on desktop environments.
%patch6 -p1 -b .abrt-server-ccpp_hook-enlarge-spool-dir-pruning-thre
%patch7 -p1 -b .rhbz-671354-RFE-Configurable-core-dump-location.patch
%patch8 -p1 -b .abrtd-pipe-post-create-output-to-log.-Closes-bz-6991.patch
-
+%patch9 -p1 -b .a-a-save-package-data-Fix-NULL-dereference.patch
+%patch10 -p1 -b .Fix-free-space-checking.patch
%build
autoconf
@@ -390,7 +393,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf
%dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name}
%dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload
-%dir %attr(0775, abrt, abrt) %{_localstatedir}/run/%{name}
+%dir %attr(0755, root, root) %{_localstatedir}/run/%{name}
%ghost %attr(0666, -, -) %{_localstatedir}/run/%{name}/abrt.socket
%ghost %attr(0644, -, -) %{_localstatedir}/run/abrtd.pid
@@ -524,6 +527,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%changelog
+* Tue Sep 13 2011 Nikola Pajkovsky <npajkovs at redhat.com> 2.0.3-4
+- fixed sigsegv in a-a-save-package-data rhbz#737961
+- fixed privs for /var/run/abrt rhbz#725974
+- fixed segv in free space check
+- Resolves: #737961 #725974
+
* Fri Sep 09 2011 Nikola Pajkovsky <npajkovs at redhat.com> 2.0.3-3
- #726192 - fix traceback introduced in previous update
More information about the scm-commits
mailing list