rpms/audit/F-8 audit-1.6.8-audispd-memleak.patch, NONE, 1.1 audit.spec, 1.154, 1.155

[Steve Grubb (sgrubb)]

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400

Modified Files:
	audit.spec 
Added Files:
	audit-1.6.8-audispd-memleak.patch 
Log Message:
* Sun Mar 02 2008 Steve Grubb <sgrubb at redhat.com> 1.6.8-2
- Fix memleak in audit event dispatcher


audit-1.6.8-audispd-memleak.patch:

--- NEW FILE audit-1.6.8-audispd-memleak.patch ---
diff -urp audit-1.6.8.orig/audisp/queue.c audit-1.6.8/audisp/queue.c
--- audit-1.6.8.orig/audisp/queue.c	2008-02-14 11:52:34.000000000 -0500
+++ audit-1.6.8/audisp/queue.c	2008-03-02 08:52:50.000000000 -0500
@@ -117,13 +117,16 @@ void enqueue(event_t *e, struct daemon_c
 {
 	unsigned int n, retry_cnt = 0;
 
-	if (processing_suspended)
+	if (processing_suspended) {
+		free(e);
 		return;
+	}
 
 retry:
 	// We allow 3 retries and then its over
 	if (retry_cnt > 3) {
 		do_overflow_action(config);
+		free(e);
 		return;
 	}
 	pthread_mutex_lock(&queue_lock);


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-8/audit.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- audit.spec	15 Feb 2008 17:03:59 -0000	1.154
+++ audit.spec	2 Mar 2008 14:04:02 -0000	1.155
@@ -1,17 +1,18 @@
 %define sca_version 0.4.5
-%define sca_release 4
+%define sca_release 5
 %define selinux_variants mls strict targeted
 %define selinux_policyver 3.0.8 
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.6.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 Patch0: audit-1.6.8-zos.patch
+Patch1: audit-1.6.8-audispd-memleak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -96,6 +97,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 mkdir zos-remote-policy
 cp -p audisp/plugins/zos-remote/policy/audispd-zos-remote.* zos-remote-policy
 
@@ -306,6 +308,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Sun Mar 02 2008 Steve Grubb <sgrubb at redhat.com> 1.6.8-2
+- Fix memleak in audit event dispatcher
+
 * Fri Feb 15 2008 Steve Grubb <sgrubb at redhat.com> 1.6.8-1
 - New upstream version
 - Cleanup descriptors in audispd before running plugin