From owner-p4-projects@FreeBSD.ORG  Sun Aug  9 18:40:06 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FE511065679; Sun,  9 Aug 2009 18:40:06 +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 EF7671065672
	for <perforce@freebsd.org>; Sun,  9 Aug 2009 18:40:05 +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 DD6158FC23
	for <perforce@freebsd.org>; Sun,  9 Aug 2009 18:40:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n79Ie5W1081475
	for <perforce@freebsd.org>; Sun, 9 Aug 2009 18:40:05 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n79Ie5mU081473
	for perforce@freebsd.org; Sun, 9 Aug 2009 18:40:05 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 9 Aug 2009 18:40:05 GMT
Message-Id: <200908091840.n79Ie5mU081473@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 167139 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: Sun, 09 Aug 2009 18:40:07 -0000

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

Change 167139 by rwatson@rwatson_freebsd_capabilities on 2009/08/09 18:39:37

	Update capabilities-related code to use revised in-kernel syscall
	argument auditing interfaces.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#26 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#12 edit

Differences ...

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

@@ -50,7 +50,7 @@
 #include "opt_capabilities.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#25 $");
+__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#26 $");
 
 #include <sys/param.h>
 #include <sys/capability.h>
@@ -282,8 +282,8 @@
 	struct file *fp, *fp_cap, *fp_object;
 	int error, fd_cap;
 
-	AUDIT_ARG(fd, uap->fd);
-	AUDIT_ARG(rights, uap->rights);
+	AUDIT_ARG_FD(uap->fd);
+	AUDIT_ARG_RIGHTS(uap->rights);
 	if ((uap->rights | CAP_MASK_VALID) != CAP_MASK_VALID)
 		return (EINVAL);
 
@@ -298,7 +298,7 @@
 	if (error)
 		goto fail;
 
-	AUDIT_ARG(file, td->td_proc, fp);
+	AUDIT_ARG_FILE(td->td_proc, fp);
 
 	/*
 	 * If a new capability is being derived from an existing capability,
@@ -367,7 +367,7 @@
 	struct file *fp;
 	int error;
 
-	AUDIT_ARG(fd, uap->fd);
+	AUDIT_ARG_FD(uap->fd);
 	error = fgetcap(td, uap->fd, &fp);
 	if (error)
 		return (error);

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

@@ -196,14 +196,14 @@
 	pid_t pid;
 	int error;
 
-	AUDIT_ARG(fd, uap->fd);
+	AUDIT_ARG_FD(uap->fd);
 	error = fget(td, uap->fd, CAP_PDGETPID, &fp);
 	if (error)
 		return (error);
 	if (fp->f_type == DTYPE_PROCDESC) {
 		pd = fp->f_data;
 		pid = pd->pd_pid;
-		AUDIT_ARG(pid, pid);
+		AUDIT_ARG_PID(pid);
 	} else
 		error = EBADF;
 	fdrop(fp, td);