From owner-p4-projects@FreeBSD.ORG  Wed Oct 14 11:49:56 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EA1501065672; Wed, 14 Oct 2009 11:49:55 +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 AE906106566C
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:49:55 +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 9B5C58FC16
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:49:55 +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 n9EBntl9012646
	for <perforce@freebsd.org>; Wed, 14 Oct 2009 11:49:55 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 n9EBnt2E012644
	for perforce@freebsd.org; Wed, 14 Oct 2009 11:49:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Oct 2009 11:49:55 GMT
Message-Id: <200910141149.n9EBnt2E012644@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169487 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: Wed, 14 Oct 2009 11:49:56 -0000

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

Change 169487 by rwatson@rwatson_cinnamon on 2009/10/14 11:49:26

	Add missing capability argument to fget(9) for 32-bit FreeBSD
	compatibility code.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_ioctl.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_ioctl.c#3 (text+ko) ====

@@ -33,6 +33,7 @@
 #include "opt_compat.h"
 
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/cdio.h>
 #include <sys/fcntl.h>
 #include <sys/filio.h>
@@ -207,7 +208,7 @@
 	struct file *fp;
 	int error;
 
-	if ((error = fget(td, uap->fd, &fp)) != 0)
+	if ((error = fget(td, uap->fd, CAP_IOCTL, &fp)) != 0)
 		return (error);
 	if ((fp->f_flag & (FREAD | FWRITE)) == 0) {
 		fdrop(fp, td);