From owner-p4-projects@FreeBSD.ORG  Thu Sep 25 06:37:58 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 461CF16A4C0; Thu, 25 Sep 2003 06:37:58 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2025F16A4B3
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 06:37:58 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 95DA144001
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 06:37:57 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8PDbvXJ096775
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 06:37:57 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8PDbuvh096772
	for perforce@freebsd.org; Thu, 25 Sep 2003 06:37:56 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Date: Thu, 25 Sep 2003 06:37:56 -0700 (PDT)
Message-Id: <200309251337.h8PDbuvh096772@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38573 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 25 Sep 2003 13:37:58 -0000

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

Change 38573 by areisse@areisse_tislabs on 2003/09/25 06:37:02

	fix auditing of capabilities

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#5 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.h#5 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#5 (text+ko) ====

@@ -97,8 +97,8 @@
 void avc_dump_av(security_class_t tclass, access_vector_t av)
 {
 	char **common_pts = 0;
-	access_vector_t common_base = 0;
-	int i, i2, perm;
+	access_vector_t common_base = 0, perm;
+	int i, i2;
 
 	if (av == 0) {
 		printk(" null");
@@ -561,7 +561,13 @@
 			printk(" key=%d", a->u.ipc_id);
 			break;
 		case AVC_AUDIT_DATA_CAP:
-			printk(" capability=%s", capv_to_text (a->u.cap));
+		{
+			const char *capt = capv_to_text (a->u.cap);
+			if (capt[7] == '!')
+				printk (" capability=<%lld>", a->u.cap);
+			else
+				printk(" capability=%s", capv_to_text (a->u.cap));
+		}
 			break;
 		case AVC_AUDIT_DATA_FS:
 			if (a->u.fs.vp) {

==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.h#5 (text+ko) ====

@@ -14,6 +14,8 @@
 #include <unistd.h>
 #endif /* _KERNEL */
 
+#include <sys/capability.h>
+
 #include <security/sebsd/flask.h>
 #include <security/sebsd/sebsd.h>
 #include <security/sebsd/avc/av_permissions.h>
@@ -63,7 +65,7 @@
 			u16 port;
 			u32 daddr;
 		} net;
-		int cap;
+		cap_value_t cap;
 		int ipc_id;
 	} u;
 };