From owner-p4-projects@FreeBSD.ORG  Mon Aug 25 01:06:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 60711106567D; Mon, 25 Aug 2008 01:06:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 245A01065675
	for <perforce@freebsd.org>; Mon, 25 Aug 2008 01:06:01 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 30E658FC15
	for <perforce@freebsd.org>; Mon, 25 Aug 2008 01:06:01 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P1607R002155
	for <perforce@freebsd.org>; Mon, 25 Aug 2008 01:06:00 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P160v8002153
	for perforce@freebsd.org; Mon, 25 Aug 2008 01:06:00 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 25 Aug 2008 01:06:00 GMT
Message-Id: <200808250106.m7P160v8002153@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 148312 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: Mon, 25 Aug 2008 01:06:01 -0000

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

Change 148312 by rwatson@rwatson_freebsd_capabilities on 2008/08/25 01:05:56

	For AUE_FEXECVE, audit file descriptor and vnode information.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#13 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#13 (text+ko) ====

@@ -426,12 +426,14 @@
 		imgp->vp = binvp;
 	} else {
 		/* XXXRW: Possibly should just be CAP_FEXECVE? */
+		AUDIT_ARG(fd, args->fd);
 		error = fgetvp_read(td, args->fd, CAP_READ | CAP_FEXECVE,
 		    &binvp);
 		if (error)
 			goto exec_fail;
 		vfslocked = VFS_LOCK_GIANT(binvp->v_mount);
 		vn_lock(binvp, LK_EXCLUSIVE | LK_RETRY);
+		AUDIT_ARG(vnode, binvp, ARG_VNODE1);
 		imgp->vp = binvp;
 	}
 

==== //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm.c#5 (text) ====

@@ -763,6 +763,11 @@
 		break;
 
 	case AUE_FEXECVE:
+		if (ARG_IS_VALID(kar, ARG_FD)) {
+			tok = au_to_arg32(1, "fd", ar->ar_arg_fd);
+			kau_write(rec, tok);
+		}
+
 	case AUE_EXECVE:
 		if (ARG_IS_VALID(kar, ARG_ARGV)) {
 			tok = au_to_exec_args(ar->ar_arg_argv,