Date: Wed, 14 Oct 2009 11:50:22 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r198074 - projects/capabilities8/sys/compat/freebsd32 Message-ID: <200910141150.n9EBoMQ4035451@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910141150.n9EBoMQ4035451>