From owner-p4-projects@FreeBSD.ORG  Thu Jul 23 03:22:14 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2CCCD1065673; Thu, 23 Jul 2009 03:22:14 +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 D58A5106566B
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 03:22:13 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E73F8FC1F
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 03:22:13 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6N3MDqJ042711
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 03:22:13 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6N3MD0a042709
	for perforce@freebsd.org; Thu, 23 Jul 2009 03:22:13 GMT
	(envelope-from jona@FreeBSD.org)
Date: Thu, 23 Jul 2009 03:22:13 GMT
Message-Id: <200907230322.n6N3MD0a042709@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166427 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: Thu, 23 Jul 2009 03:22:15 -0000

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

Change 166427 by jona@jona-trustedbsd-belle-vmware on 2009/07/23 03:21:47

	Test that cap_new(capability) wraps the original file properly

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#4 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#3 $");
+__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#4 $");
 
 #include <sys/param.h>
 #include <sys/capability.h>
@@ -57,8 +57,8 @@
 {
 	struct stat sb;
 	struct statfs sf;
-	int fd_cap;
-	ssize_t ssize;
+	int fd_cap, fd_capcap;
+	ssize_t ssize, ssize2;
 	off_t off;
 	void *p;
 	char ch;
@@ -68,6 +68,11 @@
 	if (fd_cap < 0)
 		err(-1, "cap_new");
 
+	fd_capcap = cap_new(fd_cap, rights);
+	if ((fd_capcap < 0) || (fd_capcap == fd_cap))
+		err(-1, "cap_new: fd_capcap = %i, fd_cap = %i",
+		        fd_capcap, fd_cap);
+
 	ssize = read(fd_cap, &ch, sizeof(ch));
 	if ((rights & (CAP_READ | CAP_SEEK)) == (CAP_READ | CAP_SEEK)) {
 		if (ssize < 0)
@@ -82,6 +87,11 @@
 	}
 
 	ssize = pread(fd_cap, &ch, sizeof(ch), 0);
+	ssize2 = pread(fd_cap, &ch, sizeof(ch), 0);
+	if(ssize != ssize2)
+		err(-1, "pread(fd_capcap) != pread(fd_cap) (%i != %i)",
+		        ssize2, ssize);
+
 	if (rights & CAP_READ) {
 		if (ssize < 0)
 			warnx("rights 0x%llx pread failed error %d", rights,