PERFORCE change 102682 for review

[John Baldwin]

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

Change 102682 by jhb at jhb_mutex on 2006/07/28 20:11:51

	Include a new set of macros: SYS_AUE_foo in sysproto.h which resolve
	to the audit event for syscall 'foo' and make use of this in
	SYSCALL_MODULE_HELPER to define the correct audit events for system
	calls in loadable modules (e.g. sysv IPC).

Affected files ...

.. //depot/projects/smpng/sys/kern/makesyscalls.sh#19 edit
.. //depot/projects/smpng/sys/sys/sysent.h#15 edit

Differences ...

==== //depot/projects/smpng/sys/kern/makesyscalls.sh#19 (text+ko) ====

@@ -20,6 +20,7 @@
 namesname="syscallnames"
 
 # tmp files:
+sysaue="sysent.aue.$$"
 sysdcl="sysent.dcl.$$"
 syscompat="sysent.compat.$$"
 syscompatdcl="sysent.compatdcl.$$"
@@ -30,9 +31,9 @@
 sysarg="sysarg.switch.$$"
 sysprotoend="sysprotoend.$$"
 
-trap "rm $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0
+trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0
 
-touch $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend
+touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend
 
 case $# in
     0)	echo "usage: $0 input-file <config-file>" 1>&2
@@ -58,6 +59,7 @@
 }
 ' < $1 | awk "
 	BEGIN {
+		sysaue = \"$sysaue\"
 		sysdcl = \"$sysdcl\"
 		sysproto = \"$sysproto\"
 		sysprotoend = \"$sysprotoend\"
@@ -121,6 +123,7 @@
 		printf "#include <sys/umtx.h>\n" > sysarg
 		printf "#include <posix4/_semaphore.h>\n\n" > sysarg
 		printf "#include <sys/ucontext.h>\n\n" > sysarg
+		printf "#include <bsm/audit_kevents.h>\n\n" > sysarg
 		printf "struct proc;\n\n" > sysarg
 		printf "struct thread;\n\n" > sysarg
 		printf "#define\tPAD_(t)\t(sizeof(register_t) <= sizeof(t) ? \\\n" > sysarg
@@ -315,6 +318,8 @@
 			printf("%s\t%s(struct thread *, struct %s *)",
 			    rettype, funcname, argalias) > sysdcl
 			printf(";\n") > sysdcl
+			printf("#define\t%sAUE_%s\t%s\n", syscallprefix,
+			    funcalias, auditev) > sysaue
 		}
 		if (funcname == "nosys")
 			nosys = 1
@@ -453,7 +458,7 @@
 
 		printf("\n#endif /* %s */\n\n", compat4) > syscompat4dcl
 
-		printf("#undef PAD_\n") > sysprotoend
+		printf("\n#undef PAD_\n") > sysprotoend
 		printf("#undef PADL_\n") > sysprotoend
 		printf("#undef PADR_\n") > sysprotoend
 		printf("\n#endif /* !%s */\n", sysproto_h) > sysprotoend
@@ -469,5 +474,5 @@
 cat $sysarg $sysdcl \
 	$syscompat $syscompatdcl \
 	$syscompat4 $syscompat4dcl \
-	$sysprotoend > $sysproto
+	$sysaue $sysprotoend > $sysproto
 

==== //depot/projects/smpng/sys/sys/sysent.h#15 (text+ko) ====

@@ -118,12 +118,13 @@
 };                                                             \
 DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE)
 
-#define SYSCALL_MODULE_HELPER(syscallname)              \
+#define SYSCALL_MODULE_HELPER(syscallname)		\
 static int syscallname##_syscall = SYS_##syscallname;   \
 static struct sysent syscallname##_sysent = {           \
     (sizeof(struct syscallname ## _args )               \
      / sizeof(register_t)),                             \
-    (sy_call_t *)& syscallname                          \
+    (sy_call_t *)& syscallname,				\
+    SYS_AUE_##syscallname						\
 };                                                      \
 SYSCALL_MODULE(syscallname,                             \
     & syscallname##_syscall, & syscallname##_sysent,    \