rpms/audit/devel audit-1.6.3-noretry.patch, 1.2, 1.3 audit.spec, 1.149, 1.150

[Steve Grubb (sgrubb)]

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19465

Modified Files:
	audit-1.6.3-noretry.patch audit.spec 
Log Message:
* Wed Oct 17 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-4
- Fix race between threads accessing common data in auditd
- Fix double free in event dispatcher.


audit-1.6.3-noretry.patch:

Index: audit-1.6.3-noretry.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit-1.6.3-noretry.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audit-1.6.3-noretry.patch	5 Oct 2007 15:42:18 -0000	1.2
+++ audit-1.6.3-noretry.patch	17 Oct 2007 18:21:53 -0000	1.3
@@ -1,6 +1,17 @@
+diff -urp audit-1.6.2.orig/audisp/audispd.c audit-1.6.2/audisp/audispd.c
+--- audit-1.6.2.orig/audisp/audispd.c	2007-10-17 13:56:22.000000000 -0400
++++ audit-1.6.2/audisp/audispd.c	2007-10-17 14:13:49.000000000 -0400
+@@ -369,7 +369,6 @@ int main(int argc, char *argv[])
+ 	conf = plist_get_cur(&plugin_conf);
+ 	while (conf) {
+ 		free_pconfig(conf->p);
+-		free(conf->p);
+ 		conf = plist_next(&plugin_conf);
+ 	}
+ 	plist_clear(&plugin_conf);
 diff -urp audit-1.6.2.orig/lib/lookup_table.c audit-1.6.2/lib/lookup_table.c
---- audit-1.6.2.orig/lib/lookup_table.c	2007-10-05 10:30:25.000000000 -0400
-+++ audit-1.6.2/lib/lookup_table.c	2007-10-05 10:32:01.000000000 -0400
+--- audit-1.6.2.orig/lib/lookup_table.c	2007-10-17 13:56:22.000000000 -0400
++++ audit-1.6.2/lib/lookup_table.c	2007-10-17 13:56:49.000000000 -0400
 @@ -483,7 +483,7 @@ int audit_name_to_msg_type(const char *m
  		strncpy(buf, msg_type + 8, len);
  		errno = 0;
@@ -10,10 +21,34 @@
  		errno = 0;
  		return strtol(msg_type, NULL, 10);
  	}
+diff -urp audit-1.6.2.orig/lib/msg_typetab.h audit-1.6.2/lib/msg_typetab.h
+--- audit-1.6.2.orig/lib/msg_typetab.h	2007-10-17 13:56:22.000000000 -0400
++++ audit-1.6.2/lib/msg_typetab.h	2007-10-17 13:57:27.000000000 -0400
+@@ -92,7 +92,7 @@ _S(AUDIT_KERNEL_OTHER,               "KE
+ _S(AUDIT_FD_PAIR,                    "FD_PAIR"                       )
+ _S(AUDIT_OBJ_PID,                    "OBJ_PID"                       )
+ _S(AUDIT_TTY,                        "TTY"                           )
+-//_S(AUDIT_EOE,                        "EOE"                           )
++_S(AUDIT_EOE,                        "EOE"                           )
+ _S(AUDIT_AVC,                        "AVC"                           )
+ _S(AUDIT_SELINUX_ERR,                "SELINUX_ERR"                   )
+ _S(AUDIT_AVC_PATH,                   "AVC_PATH"                      )
 diff -urp audit-1.6.2.orig/src/auditd.c audit-1.6.2/src/auditd.c
---- audit-1.6.2.orig/src/auditd.c	2007-10-05 10:31:35.000000000 -0400
-+++ audit-1.6.2/src/auditd.c	2007-10-05 10:30:04.000000000 -0400
-@@ -135,8 +135,8 @@ static void distribute_event(struct audi
+--- audit-1.6.2.orig/src/auditd.c	2007-10-17 13:56:22.000000000 -0400
++++ audit-1.6.2/src/auditd.c	2007-10-17 13:59:32.000000000 -0400
+@@ -127,16 +127,18 @@ static void distribute_event(struct audi
+ 
+ 	/* End of Event is for realtime interface - skip local logging of it */
+ 	if (rep->reply.type != AUDIT_EOE) {
++		int yield = rep->reply.type <= AUDIT_LAST_DAEMON &&
++				rep->reply.type >= AUDIT_FIRST_DAEMON ? 1 : 0;
++
+ 		/* Write to local disk */
+ 		enqueue_event(rep);
+-		if (rep->reply.type <= AUDIT_LAST_DAEMON &&
+-					 rep->reply.type >= AUDIT_FIRST_DAEMON)
++		if (yield)
+ 			pthread_yield(); /* Let other thread try to log it. */
  	}
  
  	/* Last chance to send...maybe the pipe is empty now. */


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- audit.spec	5 Oct 2007 15:42:18 -0000	1.149
+++ audit.spec	17 Oct 2007 18:21:53 -0000	1.150
@@ -1,10 +1,10 @@
 %define sca_version 0.4.3
-%define sca_release 7
+%define sca_release 8
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -217,6 +217,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Wed Oct 17 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-4
+- Fix race between threads accessing common data in auditd
+- Fix double free in event dispatcher.
+
 * Fri Oct 5 2007 Steve Grubb <sgrubb at redhat.com> 1.6.2-3
 - Fix syscall name to number conversion in libaudit.