From owner-p4-projects@FreeBSD.ORG  Thu Dec  3 14:04:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8A1101065698; Thu,  3 Dec 2009 14:04:11 +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 4EDCB106568B
	for <perforce@FreeBSD.org>; Thu,  3 Dec 2009 14:04:11 +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 3C5CC8FC15
	for <perforce@FreeBSD.org>; Thu,  3 Dec 2009 14:04:11 +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 nB3E4B3b038600
	for <perforce@FreeBSD.org>; Thu, 3 Dec 2009 14:04:11 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB3E4Bon038598
	for perforce@freebsd.org; Thu, 3 Dec 2009 14:04:11 GMT
	(envelope-from jona@FreeBSD.org)
Date: Thu, 3 Dec 2009 14:04:11 GMT
Message-Id: <200912031404.nB3E4Bon038598@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 171327 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 03 Dec 2009 14:04:11 -0000

http://p4web.freebsd.org/chv.cgi?CH=171327

Change 171327 by jona@jona-capsicum-kent64 on 2009/12/03 14:03:56

	We should, of course, be setting *base to 0, not the local variable base

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#22 edit

Differences ...

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

@@ -165,7 +165,7 @@
  * Several *at() system calls are now supported in capability mode. This function
  * finds out what their "*at base" vnode, which is needed by namei(), should be:
  *
- * 1. In non-capability (and thus unconstrained) mode, base = 0.
+ * 1. In non-capability (and thus unconstrained) mode, *base = 0.
  * 2. In capability mode, base is the vnode given by the fd parameter, subject to
  *    the condition that the supplied 'rights' parameter (OR'ed with CAP_LOOKUP
  *    and CAP_ATBASE) is satisfied. The vnode is returned with a shared lock.
@@ -174,7 +174,7 @@
 fgetbase(struct thread *td, int fd, cap_rights_t rights, struct vnode **base)
 {
 	if (!(td->td_ucred->cr_flags & CRED_FLAG_CAPMODE))
-		base = 0;
+		*base = 0;
 
 	else {
 		int error;