From ef0d1723dbbc1abcff0b5391a915db65caf90d85 Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 16 Sep 2006 17:03:02 +0000
Subject: [PATCH] Add audit hooks for ppc, ia64 system call paths.

Reviewed by:	marcel (ia64)
Obtained from:	TrustedBSD Project
MFC after:	3 days
---
 sys/ia64/ia32/ia32_trap.c  | 4 ++++
 sys/ia64/ia64/trap.c       | 4 ++++
 sys/powerpc/aim/trap.c     | 4 ++++
 sys/powerpc/powerpc/trap.c | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/sys/ia64/ia32/ia32_trap.c b/sys/ia64/ia32/ia32_trap.c
index af3f225fe43..b900d66839b 100644
--- a/sys/ia64/ia32/ia32_trap.c
+++ b/sys/ia64/ia32/ia32_trap.c
@@ -46,6 +46,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <i386/include/psl.h>
 
+#include <security/audit/audit.h>
+
 extern char *syscallnames[];
 
 static void
@@ -122,7 +124,9 @@ ia32_syscall(struct trapframe *tf)
 
 		PTRACESTOP_SC(p, td, S_PT_SCE);
 
+		AUDIT_SYSCALL_ENTER(code, td);
 		error = (*callp->sy_call)(td, args64);
+		AUDIT_SYSCALL_EXIT(error, td);
 	}
 
 	switch (error) {
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index c1a1cfaca8a..41365a9a3a9 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/ktrace.h>
 #endif
 
+#include <security/audit/audit.h>
+
 #include <ia64/disasm/disasm.h>
 
 static int print_usertrap = 0;
@@ -1016,7 +1018,9 @@ syscall(struct trapframe *tf)
 
 	PTRACESTOP_SC(p, td, S_PT_SCE);
 
+	AUDIT_SYSCALL_ENTER(code, td);
 	error = (*callp->sy_call)(td, args);
+	AUDIT_SYSCALL_EXIT(error, td);
 
 	if (error != EJUSTRETURN) {
 		/*
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index 33ad897a199..08bd24887b8 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -55,6 +55,8 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <sys/vmmeter.h>
 
+#include <security/audit/audit.h>
+
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
@@ -418,7 +420,9 @@ syscall(struct trapframe *frame)
 
 		PTRACESTOP_SC(p, td, S_PT_SCE);
 
+		AUDIT_SYSCALL_ENTER(code, td);
 		error = (*callp->sy_call)(td, params);
+		AUDIT_SYSCALL_EXIT(error, td);
 
 		CTR3(KTR_SYSC, "syscall: p=%s %s ret=%x", p->p_comm,
 		     syscallnames[code], td->td_retval[0]);
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index 33ad897a199..08bd24887b8 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -55,6 +55,8 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <sys/vmmeter.h>
 
+#include <security/audit/audit.h>
+
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
@@ -418,7 +420,9 @@ syscall(struct trapframe *frame)
 
 		PTRACESTOP_SC(p, td, S_PT_SCE);
 
+		AUDIT_SYSCALL_ENTER(code, td);
 		error = (*callp->sy_call)(td, params);
+		AUDIT_SYSCALL_EXIT(error, td);
 
 		CTR3(KTR_SYSC, "syscall: p=%s %s ret=%x", p->p_comm,
 		     syscallnames[code], td->td_retval[0]);