PERFORCE change 148006 for review

[Robert Watson]

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

Change 148006 by rwatson at rwatson_freebsd_capabilities on 2008/08/21 15:18:20

	Check capabilities for ZFS file descriptor ioctls.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 (text+ko) ====

@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/capability.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
@@ -1468,7 +1469,8 @@
 	    strchr(zc->zc_value, '@') == NULL)
 		return (EINVAL);
 
-	error = fget_read(td, zc->zc_cookie, &fp);
+	/* XXXRW: Is this the right capability? */
+	error = fget_read(td, zc->zc_cookie, CAP_READ | CAP_SEEK, &fp);
 	if (error)
 		return (error);
 
@@ -1515,7 +1517,8 @@
 	}
 
 	fd = zc->zc_cookie;
-	error = fget_write(td, fd, &fp);
+	/* XXXRW: Is this the right capability? */
+	error = fget_write(td, fd, CAP_WRITE | CAP_SEEK, &fp);
 	if (error) {
 		dmu_objset_close(tosnap);
 		if (fromsnap)