From owner-p4-projects@FreeBSD.ORG  Wed Nov 30 23:55:42 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADF3416A423; Wed, 30 Nov 2005 23:55:41 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 852CE16A41F
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 23:55:41 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 41FCB43D62
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 23:55:41 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAUNtfXu080196
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 23:55:41 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAUNteig080193
	for perforce@freebsd.org; Wed, 30 Nov 2005 23:55:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 30 Nov 2005 23:55:40 GMT
Message-Id: <200511302355.jAUNteig080193@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87553 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Nov 2005 23:55:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=87553

Change 87553 by rwatson@rwatson_peppercorn on 2005/11/30 23:54:59

	Acquire mutex in entry API functions for BSM events, in order to
	improve atomicity between rewind of the event file and beginning
	iteration.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#5 (text+ko) ====

@@ -135,13 +135,20 @@
 /*
  * Rewind the audit_event file.
  */
+static void
+setauevent_locked(void)
+{
+
+	if (fp != NULL)
+		fseek(fp, 0, SEEK_SET);
+}
+
 void
 setauevent(void)
 {
 
 	pthread_mutex_lock(&mutex);
-	if (fp != NULL)
-		fseek(fp, 0, SEEK_SET);
+	setauevent_locked();
 	pthread_mutex_unlock(&mutex);
 }
 
@@ -213,11 +220,11 @@
 	if (name == NULL)
 		return (NULL);
 
+	pthread_mutex_lock(&mutex);
+
 	/* Rewind to beginning of the file. */
-	setauevent();
+	setauevent_locked();
 
-	pthread_mutex_lock(&mutex);
-
 	if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) {
 		pthread_mutex_unlock(&mutex);
 		return (NULL);
@@ -242,8 +249,10 @@
 		}
 	}
 
+	pthread_mutex_unlock(&mutex);
+
 	free_au_event_ent(e);
-	pthread_mutex_unlock(&mutex);
+
 	return (NULL);
 }
 
@@ -255,11 +264,11 @@
 	struct au_event_ent *e;
 	char *nl;
 
+	pthread_mutex_lock(&mutex);
+
 	/* Rewind to beginning of the file. */
-	setauevent();
+	setauevent_locked();
 
-	pthread_mutex_lock(&mutex);
-
 	if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) {
 		pthread_mutex_unlock(&mutex);
 		return (NULL);
@@ -284,8 +293,8 @@
 		}
 	}
 
+	pthread_mutex_unlock(&mutex);
 	free_au_event_ent(e);
-	pthread_mutex_unlock(&mutex);
 	return (NULL);
 
 }