PERFORCE change 163641 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=163641

Change 163641 by rwatson at rwatson_freebsd_capabilities on 2009/06/06 10:15:29

	Update for missing capability.h includes, in one or two cases update
	new calls to fget() to take a capability mask.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_fcntl.c#7 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_ioctl.c#4 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_stream.c#5 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ipmi/ipmi_linux.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfs/nfsport.h#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clport.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsserver/nfs_nfsdport.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/security/mac/mac_syscalls.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_fcntl.c#7 (text+ko) ====

@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.48 2009/06/05 14:55:22 rwatson Exp $");
 
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_ioctl.c#4 (text+ko) ====

@@ -30,6 +30,7 @@
 __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.26 2009/05/29 05:58:46 delphij Exp $");
 
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.29 2009/05/08 20:16:04 ed Exp $
- * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
 #ifndef _SVR4_SYSPROTO_H_

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_stream.c#5 (text+ko) ====

@@ -42,6 +42,7 @@
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/ipmi/ipmi_linux.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
@@ -92,7 +93,7 @@
 	u_long cmd;
 	int error;
 
-	if ((error = fget(td, args->fd, &fp)) != 0)
+	if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0)
 		return (error);
 	cmd = args->cmd;
 

==== //depot/projects/trustedbsd/capabilities/src/sys/fs/nfs/nfsport.h#2 (text+ko) ====

@@ -42,6 +42,7 @@
 #ifdef _KERNEL
 #include <sys/unistd.h>
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/dirent.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clport.c#2 (text+ko) ====

@@ -1184,7 +1184,8 @@
 		error = copyin(uap->argp, (caddr_t)&nfscbdarg, sizeof(nfscbdarg));
 		if (error)
 			return (error);
-		if ((error = fget(td, nfscbdarg.sock, &fp)) != 0) {
+		if ((error = fget(td, nfscbdarg.sock, CAP_SOCK_ALL, &fp))
+		    != 0) {
 			return (error);
 		}
 		if (fp->f_type != DTYPE_SOCKET) {

==== //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsserver/nfs_nfsdport.c#2 (text+ko) ====

@@ -2928,7 +2928,8 @@
 		error = copyin(uap->argp, (caddr_t)&sockarg, sizeof (sockarg));
 		if (error)
 			return (error);
-		if ((error = fget(td, sockarg.sock, &fp)) != 0) {
+		if ((error = fget(td, sockarg.sock, CAP_SOCK_ALL, &fp))
+		    != 0) {
 			return (error);
 		}
 		if (fp->f_type != DTYPE_SOCKET) {

==== //depot/projects/trustedbsd/capabilities/src/sys/security/mac/mac_syscalls.c#6 (text+ko) ====

@@ -48,6 +48,7 @@
 #include "opt_mac.h"
 
 #include <sys/param.h>
+#include <sys/capability.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>