From owner-p4-projects@FreeBSD.ORG  Sat Feb  4 16:22:00 2006
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 AC34D16A543; Sat,  4 Feb 2006 16:21:54 +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 0D40516A49E
	for <perforce@freebsd.org>; Sat,  4 Feb 2006 16:21:49 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0EDEC444B0
	for <perforce@freebsd.org>; Sat,  4 Feb 2006 15:56:39 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14FucYp020418
	for <perforce@freebsd.org>; Sat, 4 Feb 2006 15:56:38 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14FucJY020415
	for perforce@freebsd.org; Sat, 4 Feb 2006 15:56:38 GMT
	(envelope-from wsalamon@computer.org)
Date: Sat, 4 Feb 2006 15:56:38 GMT
Message-Id: <200602041556.k14FucJY020415@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91071 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: Sat, 04 Feb 2006 16:22:01 -0000

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

Change 91071 by wsalamon@gretsch on 2006/02/04 15:56:37

	Call the audit hooks for the amd64 architectures.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#7 edit
.. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#7 (text+ko) ====

@@ -75,6 +75,7 @@
 #ifdef HWPMC_HOOKS
 #include <sys/pmckern.h>
 #endif
+#include <security/audit/audit.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -823,10 +824,15 @@
 
 		if ((callp->sy_narg & SYF_MPSAFE) == 0) {
 			mtx_lock(&Giant);
+			AUDIT_SYSCALL_ENTER(code, td);
 			error = (*callp->sy_call)(td, argp);
+			AUDIT_SYSCALL_EXIT(error, td);
 			mtx_unlock(&Giant);
-		} else
+		} else {
+			AUDIT_SYSCALL_ENTER(code, td);
 			error = (*callp->sy_call)(td, argp);
+			AUDIT_SYSCALL_EXIT(error, td);
+		}
 	}
 
 	switch (error) {

==== //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#5 (text+ko) ====

@@ -66,6 +66,7 @@
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
+#include <security/audit/audit.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -184,7 +185,9 @@
 
 		STOPEVENT(p, S_SCE, narg);
 
+		AUDIT_SYSCALL_ENTER(code, td);
 		error = (*callp->sy_call)(td, args64);
+		AUDIT_SYSCALL_EXIT(error, td);
 	}
 
 	switch (error) {