From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 14 11:50:22 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D88D61065693;
	Wed, 14 Oct 2009 11:50:22 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C813F8FC1F;
	Wed, 14 Oct 2009 11:50:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EBoMeD035453;
	Wed, 14 Oct 2009 11:50:22 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9EBoMQ4035451;
	Wed, 14 Oct 2009 11:50:22 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910141150.n9EBoMQ4035451@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 14 Oct 2009 11:50:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198074 - projects/capabilities8/sys/compat/freebsd32
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 11:50:22 -0000

Author: rwatson
Date: Wed Oct 14 11:50:22 2009
New Revision: 198074
URL: http://svn.freebsd.org/changeset/base/198074

Log:
  Merge Perforce c169487 to capabilities8 branch:
  
    Add missing capability argument to fget(9) for 32-bit FreeBSD
    compatibility code.
  
  Obtained from:	TrustedBSD Project
  Sponsored by:	Google

Modified:
  projects/capabilities8/sys/compat/freebsd32/freebsd32_ioctl.c

Modified: projects/capabilities8/sys/compat/freebsd32/freebsd32_ioctl.c
==============================================================================
--- projects/capabilities8/sys/compat/freebsd32/freebsd32_ioctl.c	Wed Oct 14 09:42:43 2009	(r198073)
+++ projects/capabilities8/sys/compat/freebsd32/freebsd32_ioctl.c	Wed Oct 14 11:50:22 2009	(r198074)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #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 @@ freebsd32_ioctl(struct thread *td, struc
 	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);