svn commit: r188311 - in head/sys: nfsserver security/audit

[Robert Watson]

Author: rwatson
Date: Sun Feb  8 14:04:08 2009
New Revision: 188311
URL: http://svn.freebsd.org/changeset/base/188311

Log:
  Audit the flag argument to the nfssvc(2) system call.
  
  Obtained from:	TrustedBSD Project
  Sponsored by:	Apple, Inc.

Modified:
  head/sys/nfsserver/nfs_syscalls.c
  head/sys/security/audit/audit_bsm.c

Modified: head/sys/nfsserver/nfs_syscalls.c
==============================================================================
--- head/sys/nfsserver/nfs_syscalls.c	Sun Feb  8 12:40:33 2009	(r188310)
+++ head/sys/nfsserver/nfs_syscalls.c	Sun Feb  8 14:04:08 2009	(r188311)
@@ -137,6 +137,8 @@ nfssvc(struct thread *td, struct nfssvc_
 
 	KASSERT(!mtx_owned(&Giant), ("nfssvc(): called with Giant"));
 
+	AUDIT_ARG(cmd, uap->flag);
+
 	error = priv_check(td, PRIV_NFS_DAEMON);
 	if (error)
 		return (error);

Modified: head/sys/security/audit/audit_bsm.c
==============================================================================
--- head/sys/security/audit/audit_bsm.c	Sun Feb  8 12:40:33 2009	(r188310)
+++ head/sys/security/audit/audit_bsm.c	Sun Feb  8 14:04:08 2009	(r188311)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2005 Apple Inc.
+ * Copyright (c) 1999-2009 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -639,7 +639,6 @@ kaudit_to_bsm(struct kaudit_record *kar,
 	case AUE_MODLOAD:
 	case AUE_MODUNLOAD:
 	case AUE_MSGSYS:
-	case AUE_NFS_SVC:
 	case AUE_NTP_ADJTIME:
 	case AUE_PIPE:
 	case AUE_PROFILE:
@@ -1017,6 +1016,13 @@ kaudit_to_bsm(struct kaudit_record *kar,
 		}
 		/* FALLTHROUGH */
 
+	case AUE_NFS_SVC:
+		if (ARG_IS_VALID(kar, ARG_CMD)) {
+			tok = au_to_arg32(1, "request", ar->ar_arg_cmd);
+			kau_write(rec, tok);
+		}
+		break;
+
 	case AUE_UMOUNT:
 		UPATH1_VNODE1_TOKENS;
 		break;