svn commit: r198074 - projects/capabilities8/sys/compat/freebsd32

Robert Watson rwatson at FreeBSD.org
Wed Oct 14 11:50:22 UTC 2009


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);


More information about the svn-src-projects mailing list