rpms/audit/FC-6 audit-1.5.2-segfault.patch, NONE, 1.1 audit.spec, 1.124, 1.125

[fedora-cvs-commits at redhat.com]

Author: sgrubb

Update of /cvs/dist/rpms/audit/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9964

Modified Files:
	audit.spec 
Added Files:
	audit-1.5.2-segfault.patch 
Log Message:
* Tue Mar 20 2007 Steve Grubb <sgrubb at redhat.com> 1.4.2-5
- Added patch to prevent segfault on reload.


audit-1.5.2-segfault.patch:
 auditd-event.c |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

--- NEW FILE audit-1.5.2-segfault.patch ---
diff -urp audit-1.5.2.orig/src/auditd-event.c audit-1.5.2/src/auditd-event.c
--- audit-1.5.2.orig/src/auditd-event.c	2007-02-20 18:01:42.000000000 -0500
+++ audit-1.5.2/src/auditd-event.c	2007-03-23 11:36:34.000000000 -0400
@@ -1006,10 +1006,16 @@ static void reconfigure(struct auditd_co
 	}
 
 	// space left exe
-	if (strcmp(oconf->space_left_exe, nconf->space_left_exe))
-		need_space_check = 1;
-	free(oconf->space_left_exe);
-	oconf->space_left_exe = nconf->space_left_exe;
+	if (oconf->space_left_exe || nconf->space_left_exe) {
+		if (nconf->space_left_exe == NULL)
+			; /* do nothing if new one is blank */
+		else if (oconf->space_left_exe == NULL && nconf->space_left_exe)
+			need_space_check = 1;
+		else if (strcmp(oconf->space_left_exe, nconf->space_left_exe))
+			need_space_check = 1;
+		free(oconf->space_left_exe);
+		oconf->space_left_exe = nconf->space_left_exe;
+	}
 
 	// admin space left
 	if (oconf->admin_space_left != nconf->admin_space_left) {
@@ -1024,11 +1030,18 @@ static void reconfigure(struct auditd_co
 	}
 
 	// admin space left exe
-	if (strcmp(oconf->admin_space_left_exe, nconf->admin_space_left_exe))
-		need_space_check = 1;
-	free(oconf->admin_space_left_exe);
-	oconf->admin_space_left_exe = nconf->admin_space_left_exe;
-
+	if (oconf->admin_space_left_exe || nconf->admin_space_left_exe) {
+		if (nconf->admin_space_left_exe == NULL)
+			; /* do nothing if new one is blank */
+		else if (oconf->admin_space_left_exe == NULL &&
+					 nconf->admin_space_left_exe)
+			need_space_check = 1;
+		else if (strcmp(oconf->admin_space_left_exe,
+					nconf->admin_space_left_exe))
+			need_space_check = 1;
+		free(oconf->admin_space_left_exe);
+		oconf->admin_space_left_exe = nconf->admin_space_left_exe;
+	}
 	// disk full action
 	if (oconf->disk_full_action != nconf->disk_full_action) {
 		oconf->disk_full_action = nconf->disk_full_action;
@@ -1036,10 +1049,16 @@ static void reconfigure(struct auditd_co
 	}
 
 	// disk full exe
-	if (strcmp(oconf->disk_full_exe, nconf->disk_full_exe))
-		need_space_check = 1;
-	free(oconf->disk_full_exe);
-	oconf->disk_full_exe = nconf->disk_full_exe;
+	if (oconf->disk_full_exe || nconf->disk_full_exe) {
+		if (nconf->disk_full_exe == NULL)
+			; /* do nothing if new one is blank */
+		else if (oconf->disk_full_exe == NULL && nconf->disk_full_exe)
+			need_space_check = 1;
+		else if (strcmp(oconf->disk_full_exe, nconf->disk_full_exe))
+			need_space_check = 1;
+		free(oconf->disk_full_exe);
+		oconf->disk_full_exe = nconf->disk_full_exe;
+	}
 
 	if (need_space_check) {
 		/* note save suspended flag, then do space_left. If suspended


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-6/audit.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- audit.spec	20 Mar 2007 19:45:50 -0000	1.124
+++ audit.spec	28 Mar 2007 15:49:52 -0000	1.125
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -9,6 +9,7 @@
 Patch1: audit-1.4.2-auparse.patch
 Patch2: audit-1.5.patch
 Patch3: audit-1.5.1-update.patch
+Patch4: audit-1.5.2-segfault.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -50,7 +51,6 @@
 License: LGPL
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kernel-headers >= 2.6.18
 
 %description libs-python
 The audit-libs-python package contains the bindings so that libaudit
@@ -61,6 +61,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -fv --install
@@ -180,6 +181,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Tue Mar 20 2007 Steve Grubb <sgrubb at redhat.com> 1.4.2-5
+- Added patch to prevent segfault on reload.
+
 * Tue Mar 20 2007 Steve Grubb <sgrubb at redhat.com> 1.4.2-4
 - Updated autrace to monitor *at syscalls
 - Add support in libaudit for AUDIT_BIT_TEST(&=) and AUDIT_MASK_TEST (&)