xnu-2422.115.4.tar.gz

[apple/xnu.git] / bsd / miscfs / devfs / devfs_vfsops.c

diff --git a/bsd/miscfs/devfs/devfs_vfsops.c b/bsd/miscfs/devfs/devfs_vfsops.c
index d7db72496645e199823e52e915f3ebe2e0f0e613..b40778e88c9cafb195e1ae693fce1d5a03b24db9 100644 (file)
--- a/bsd/miscfs/devfs/devfs_vfsops.c
+++ b/bsd/miscfs/devfs/devfs_vfsops.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -53,6 +53,12 @@
  * devfs_vfsops.c
  *
  */
  * devfs_vfsops.c
  *
  */

+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */

 /*
  * HISTORY
  *  Dieter Siegmund (dieter@apple.com) Wed Jul 14 13:37:59 PDT 1999
 /*
  * HISTORY
  *  Dieter Siegmund (dieter@apple.com) Wed Jul 14 13:37:59 PDT 1999


@@ -70,15 +76,27 @@
 #include <sys/mount_internal.h>
 #include <sys/malloc.h>
 
 #include <sys/mount_internal.h>
 #include <sys/malloc.h>
 

+#include <libkern/OSAtomic.h>
+
+#if CONFIG_MACF
+#include <security/mac_framework.h>
+#endif
+

 #include "devfs.h"
 #include "devfsdefs.h"
 
 #include "devfs.h"
 #include "devfsdefs.h"
 

-static int devfs_statfs( struct mount *mp, struct vfsstatfs *sbp, vfs_context_t context);
-static int devfs_vfs_getattr(mount_t mp, struct vfs_attr *fsap, vfs_context_t context);
+#if FDESC
+#include "fdesc.h"
+#endif /* FDESC */

 
 

-static struct vfstable * devfs_vfsp = 0;
-extern int setup_kmem;

 
 

+static int devfs_statfs( struct mount *mp, struct vfsstatfs *sbp, vfs_context_t ctx);
+static int devfs_vfs_getattr(mount_t mp, struct vfs_attr *fsap, vfs_context_t ctx);
+
+#if !defined(SECURE_KERNEL)
+extern int setup_kmem;
+__private_extern__ void devfs_setup_kmem(void);
+#endif

 
 /*-
  * Called from the generic VFS startups.
 
 /*-
  * Called from the generic VFS startups.


@@ -89,28 +107,34 @@ extern int setup_kmem;
  * devices from devfs get sync'd.
  */
 static int
  * devices from devfs get sync'd.
  */
 static int

-devfs_init(struct vfsconf *vfsp)
+devfs_init(__unused struct vfsconf *vfsp)

 {
 {

-    devfs_vfsp = (struct vfstable *)vfsp; /* remember this for devfs_kernel_mount below */
-

     if (devfs_sinit())
        return (ENOTSUP);
     devfs_make_node(makedev(0, 0), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0622, "console");
     devfs_make_node(makedev(2, 0), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0666, "tty");
     if (devfs_sinit())
        return (ENOTSUP);
     devfs_make_node(makedev(0, 0), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0622, "console");
     devfs_make_node(makedev(2, 0), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0666, "tty");

+#if !defined(SECURE_KERNEL)

     if (setup_kmem) {
        devfs_setup_kmem();
     }
     if (setup_kmem) {
        devfs_setup_kmem();
     }

+#endif

     devfs_make_node(makedev(3, 2), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0666, "null");
     devfs_make_node(makedev(3, 3), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0666, "zero");
     devfs_make_node(makedev(6, 0), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0600, "klog");
     devfs_make_node(makedev(3, 2), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0666, "null");
     devfs_make_node(makedev(3, 3), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0666, "zero");
     devfs_make_node(makedev(6, 0), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0600, "klog");

+
+#if  FDESC
+    devfs_fdesc_init();
+#endif
+

     return 0;
 }
 
     return 0;
 }
 

+#if !defined(SECURE_KERNEL)

 __private_extern__ void
 devfs_setup_kmem(void)
 {
 __private_extern__ void
 devfs_setup_kmem(void)
 {


@@ -119,6 +143,7 @@ devfs_setup_kmem(void)
        devfs_make_node(makedev(3, 1), DEVFS_CHAR, 
                    UID_ROOT, GID_KMEM, 0640, "kmem");
 }
        devfs_make_node(makedev(3, 1), DEVFS_CHAR, 
                    UID_ROOT, GID_KMEM, 0640, "kmem");
 }

+#endif

 
 
 /*-
 
 
 /*-


@@ -136,7 +161,7 @@ devfs_setup_kmem(void)
  */
 /*proto*/
 int
  */
 /*proto*/
 int

-devfs_mount(struct mount *mp, __unused vnode_t devvp, __unused user_addr_t data, vfs_context_t context)
+devfs_mount(struct mount *mp, __unused vnode_t devvp, __unused user_addr_t data, vfs_context_t ctx)

 {
        struct devfsmount *devfs_mp_p;  /* devfs specific mount info */
        int error;
 {
        struct devfsmount *devfs_mp_p;  /* devfs specific mount info */
        int error;


@@ -169,7 +194,7 @@ devfs_mount(struct mount *mp, __unused vnode_t devvp, __unused user_addr_t data,
         *  Fill out some fields
         */
        mp->mnt_data = (qaddr_t)devfs_mp_p;
         *  Fill out some fields
         */
        mp->mnt_data = (qaddr_t)devfs_mp_p;

-       mp->mnt_vfsstat.f_fsid.val[0] = (int32_t)(void *)devfs_mp_p;
+       mp->mnt_vfsstat.f_fsid.val[0] = (int32_t)(uintptr_t)devfs_mp_p;

        mp->mnt_vfsstat.f_fsid.val[1] = vfs_typenum(mp);
        mp->mnt_flag |= MNT_LOCAL;
 
        mp->mnt_vfsstat.f_fsid.val[1] = vfs_typenum(mp);
        mp->mnt_flag |= MNT_LOCAL;
 


@@ -193,14 +218,14 @@ devfs_mount(struct mount *mp, __unused vnode_t devvp, __unused user_addr_t data,
        
        bzero(mp->mnt_vfsstat.f_mntfromname, MAXPATHLEN);
        bcopy("devfs",mp->mnt_vfsstat.f_mntfromname, 5);
        
        bzero(mp->mnt_vfsstat.f_mntfromname, MAXPATHLEN);
        bcopy("devfs",mp->mnt_vfsstat.f_mntfromname, 5);

-       (void)devfs_statfs(mp, &mp->mnt_vfsstat, context);
+       (void)devfs_statfs(mp, &mp->mnt_vfsstat, ctx);

 
        return 0;
 }
 
 
 static int
 
        return 0;
 }
 
 
 static int

-devfs_start(__unused struct mount *mp, __unused int flags, __unused vfs_context_t context)
+devfs_start(__unused struct mount *mp, __unused int flags, __unused vfs_context_t ctx)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -209,7 +234,7 @@ devfs_start(__unused struct mount *mp, __unused int flags, __unused vfs_context_
  *  Unmount the filesystem described by mp.
  */
 static int
  *  Unmount the filesystem described by mp.
  */
 static int

-devfs_unmount( struct mount *mp, int mntflags, __unused vfs_context_t context)
+devfs_unmount( struct mount *mp, int mntflags, __unused vfs_context_t ctx)

 {
        struct devfsmount *devfs_mp_p = (struct devfsmount *)mp->mnt_data;
        int flags = 0;
 {
        struct devfsmount *devfs_mp_p = (struct devfsmount *)mp->mnt_data;
        int flags = 0;


@@ -239,20 +264,21 @@ devfs_unmount( struct mount *mp, int mntflags, __unused vfs_context_t context)
 
 /* return the address of the root vnode  in *vpp */
 static int
 
 /* return the address of the root vnode  in *vpp */
 static int

-devfs_root(struct mount *mp, struct vnode **vpp, vfs_context_t context)
+devfs_root(struct mount *mp, struct vnode **vpp, __unused vfs_context_t ctx)

 {
        struct devfsmount *devfs_mp_p = (struct devfsmount *)(mp->mnt_data);
        int error;
 
        DEVFS_LOCK();
 {
        struct devfsmount *devfs_mp_p = (struct devfsmount *)(mp->mnt_data);
        int error;
 
        DEVFS_LOCK();

-       error = devfs_dntovn(devfs_mp_p->plane_root->de_dnp, vpp, context->vc_proc);
+       /* last parameter to devfs_dntovn() is ignored */
+       error = devfs_dntovn(devfs_mp_p->plane_root->de_dnp, vpp, NULL);

        DEVFS_UNLOCK();
 
        return error;
 }
 
 static int
        DEVFS_UNLOCK();
 
        return error;
 }
 
 static int

-devfs_statfs( struct mount *mp, struct vfsstatfs *sbp, __unused vfs_context_t context)
+devfs_statfs( struct mount *mp, struct vfsstatfs *sbp, __unused vfs_context_t ctx)

 {
        struct devfsmount *devfs_mp_p = (struct devfsmount *)mp->mnt_data;
 
 {
        struct devfsmount *devfs_mp_p = (struct devfsmount *)mp->mnt_data;
 


@@ -272,14 +298,14 @@ devfs_statfs( struct mount *mp, struct vfsstatfs *sbp, __unused vfs_context_t co
        sbp->f_bavail = 0;
        sbp->f_files  = devfs_stats.nodes;
        sbp->f_ffree  = 0;
        sbp->f_bavail = 0;
        sbp->f_files  = devfs_stats.nodes;
        sbp->f_ffree  = 0;

-       sbp->f_fsid.val[0] = (int32_t)(void *)devfs_mp_p;
+       sbp->f_fsid.val[0] = (int32_t)(uintptr_t)devfs_mp_p;

        sbp->f_fsid.val[1] = vfs_typenum(mp);
 
        return 0;
 }
 
 static int
        sbp->f_fsid.val[1] = vfs_typenum(mp);
 
        return 0;
 }
 
 static int

-devfs_vfs_getattr(mount_t mp, struct vfs_attr *fsap, vfs_context_t context)
+devfs_vfs_getattr(__unused mount_t mp, struct vfs_attr *fsap, __unused vfs_context_t ctx)

 {
        VFSATTR_RETURN(fsap, f_objcount, devfs_stats.nodes);
        VFSATTR_RETURN(fsap, f_maxobjcount, devfs_stats.nodes);
 {
        VFSATTR_RETURN(fsap, f_objcount, devfs_stats.nodes);
        VFSATTR_RETURN(fsap, f_maxobjcount, devfs_stats.nodes);


@@ -301,18 +327,120 @@ devfs_vfs_getattr(mount_t mp, struct vfs_attr *fsap, vfs_context_t context)
        VFSATTR_RETURN(fsap, f_ffree, 0);
        VFSATTR_RETURN(fsap, f_fssubtype, 0);
        
        VFSATTR_RETURN(fsap, f_ffree, 0);
        VFSATTR_RETURN(fsap, f_fssubtype, 0);
        

+       if (VFSATTR_IS_ACTIVE(fsap, f_capabilities)) {
+               fsap->f_capabilities.capabilities[VOL_CAPABILITIES_FORMAT] =
+                       VOL_CAP_FMT_SYMBOLICLINKS |
+                       VOL_CAP_FMT_HARDLINKS |
+                       VOL_CAP_FMT_NO_ROOT_TIMES |
+                       VOL_CAP_FMT_CASE_SENSITIVE |
+                       VOL_CAP_FMT_CASE_PRESERVING |
+                       VOL_CAP_FMT_FAST_STATFS |
+                       VOL_CAP_FMT_2TB_FILESIZE |
+                       VOL_CAP_FMT_HIDDEN_FILES;
+               fsap->f_capabilities.capabilities[VOL_CAPABILITIES_INTERFACES] =
+                       VOL_CAP_INT_ATTRLIST ;
+               fsap->f_capabilities.capabilities[VOL_CAPABILITIES_RESERVED1] = 0;
+               fsap->f_capabilities.capabilities[VOL_CAPABILITIES_RESERVED2] = 0;
+               
+               fsap->f_capabilities.valid[VOL_CAPABILITIES_FORMAT] =
+                       VOL_CAP_FMT_PERSISTENTOBJECTIDS |
+                       VOL_CAP_FMT_SYMBOLICLINKS |
+                       VOL_CAP_FMT_HARDLINKS |
+                       VOL_CAP_FMT_JOURNAL |
+                       VOL_CAP_FMT_JOURNAL_ACTIVE |
+                       VOL_CAP_FMT_NO_ROOT_TIMES |
+                       VOL_CAP_FMT_SPARSE_FILES |
+                       VOL_CAP_FMT_ZERO_RUNS |
+                       VOL_CAP_FMT_CASE_SENSITIVE |
+                       VOL_CAP_FMT_CASE_PRESERVING |
+                       VOL_CAP_FMT_FAST_STATFS |
+                       VOL_CAP_FMT_2TB_FILESIZE |
+                       VOL_CAP_FMT_OPENDENYMODES |
+                       VOL_CAP_FMT_HIDDEN_FILES |
+                       VOL_CAP_FMT_PATH_FROM_ID |
+                       VOL_CAP_FMT_NO_VOLUME_SIZES;
+               fsap->f_capabilities.valid[VOL_CAPABILITIES_INTERFACES] =
+                       VOL_CAP_INT_SEARCHFS |
+                       VOL_CAP_INT_ATTRLIST |
+                       VOL_CAP_INT_NFSEXPORT |
+                       VOL_CAP_INT_READDIRATTR |
+                       VOL_CAP_INT_EXCHANGEDATA |
+                       VOL_CAP_INT_COPYFILE |
+                       VOL_CAP_INT_ALLOCATE |
+                       VOL_CAP_INT_VOL_RENAME |
+                       VOL_CAP_INT_ADVLOCK |
+                       VOL_CAP_INT_FLOCK |
+                       VOL_CAP_INT_EXTENDED_SECURITY |
+                       VOL_CAP_INT_USERACCESS |
+                       VOL_CAP_INT_MANLOCK |
+                       VOL_CAP_INT_EXTENDED_ATTR |
+                       VOL_CAP_INT_NAMEDSTREAMS;
+               fsap->f_capabilities.valid[VOL_CAPABILITIES_RESERVED1] = 0;
+               fsap->f_capabilities.valid[VOL_CAPABILITIES_RESERVED2] = 0;
+               
+               VFSATTR_SET_SUPPORTED(fsap, f_capabilities);
+       }
+       
+       if (VFSATTR_IS_ACTIVE(fsap, f_attributes)) {
+               fsap->f_attributes.validattr.commonattr =
+                       ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_FSID |
+                       ATTR_CMN_OBJTYPE | ATTR_CMN_OBJTAG | ATTR_CMN_OBJID |
+                       ATTR_CMN_PAROBJID |
+                       ATTR_CMN_MODTIME | ATTR_CMN_CHGTIME | ATTR_CMN_ACCTIME |
+                       ATTR_CMN_OWNERID | ATTR_CMN_GRPID | ATTR_CMN_ACCESSMASK |
+                       ATTR_CMN_FLAGS | ATTR_CMN_USERACCESS | ATTR_CMN_FILEID;
+               fsap->f_attributes.validattr.volattr =
+                       ATTR_VOL_FSTYPE | ATTR_VOL_SIZE | ATTR_VOL_SPACEFREE |
+                       ATTR_VOL_SPACEAVAIL | ATTR_VOL_MINALLOCATION |
+                       ATTR_VOL_OBJCOUNT | ATTR_VOL_MAXOBJCOUNT |
+                       ATTR_VOL_MOUNTPOINT | ATTR_VOL_MOUNTFLAGS |
+                       ATTR_VOL_MOUNTEDDEVICE | ATTR_VOL_CAPABILITIES |
+                       ATTR_VOL_ATTRIBUTES;
+               fsap->f_attributes.validattr.dirattr =
+                       ATTR_DIR_LINKCOUNT | ATTR_DIR_MOUNTSTATUS;
+               fsap->f_attributes.validattr.fileattr =
+                       ATTR_FILE_LINKCOUNT | ATTR_FILE_TOTALSIZE |
+                       ATTR_FILE_IOBLOCKSIZE | ATTR_FILE_DEVTYPE |
+                       ATTR_FILE_DATALENGTH;
+               fsap->f_attributes.validattr.forkattr = 0;
+               
+               fsap->f_attributes.nativeattr.commonattr =
+                       ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_FSID |
+                       ATTR_CMN_OBJTYPE | ATTR_CMN_OBJTAG | ATTR_CMN_OBJID |
+                       ATTR_CMN_PAROBJID |
+                       ATTR_CMN_MODTIME | ATTR_CMN_CHGTIME | ATTR_CMN_ACCTIME |
+                       ATTR_CMN_OWNERID | ATTR_CMN_GRPID | ATTR_CMN_ACCESSMASK |
+                       ATTR_CMN_FLAGS | ATTR_CMN_USERACCESS | ATTR_CMN_FILEID;
+               fsap->f_attributes.nativeattr.volattr =
+                       ATTR_VOL_FSTYPE | ATTR_VOL_SIZE | ATTR_VOL_SPACEFREE |
+                       ATTR_VOL_SPACEAVAIL | ATTR_VOL_MINALLOCATION |
+                       ATTR_VOL_OBJCOUNT | ATTR_VOL_MAXOBJCOUNT |
+                       ATTR_VOL_MOUNTPOINT | ATTR_VOL_MOUNTFLAGS |
+                       ATTR_VOL_MOUNTEDDEVICE | ATTR_VOL_CAPABILITIES |
+                       ATTR_VOL_ATTRIBUTES;
+               fsap->f_attributes.nativeattr.dirattr =
+                       ATTR_DIR_MOUNTSTATUS;
+               fsap->f_attributes.nativeattr.fileattr =
+                       ATTR_FILE_LINKCOUNT | ATTR_FILE_TOTALSIZE |
+                       ATTR_FILE_IOBLOCKSIZE | ATTR_FILE_DEVTYPE |
+                       ATTR_FILE_DATALENGTH;
+               fsap->f_attributes.nativeattr.forkattr = 0;
+
+               VFSATTR_SET_SUPPORTED(fsap, f_attributes);
+       }
+       

        return 0;
 }
 
 static int
        return 0;
 }
 
 static int

-devfs_sync(__unused struct mount *mp, __unused int waitfor, __unused vfs_context_t context)
+devfs_sync(__unused struct mount *mp, __unused int waitfor, __unused vfs_context_t ctx)

 {
     return (0);
 }
 
 
 static int
 {
     return (0);
 }
 
 
 static int

-devfs_vget(__unused struct mount *mp, __unused ino64_t ino, __unused struct vnode **vpp, __unused vfs_context_t context)
+devfs_vget(__unused struct mount *mp, __unused ino64_t ino, __unused struct vnode **vpp, __unused vfs_context_t ctx)

 {
        return ENOTSUP;
 }
 {
        return ENOTSUP;
 }


@@ -323,14 +451,14 @@ devfs_vget(__unused struct mount *mp, __unused ino64_t ino, __unused struct vnod
  */
 
 static int
  */
 
 static int

-devfs_fhtovp (__unused struct mount *mp, __unused int fhlen, __unused unsigned char *fhp, __unused struct vnode **vpp, __unused vfs_context_t context)
+devfs_fhtovp (__unused struct mount *mp, __unused int fhlen, __unused unsigned char *fhp, __unused struct vnode **vpp, __unused vfs_context_t ctx)

 {
        return (EINVAL);
 }
 
 
 static int
 {
        return (EINVAL);
 }
 
 
 static int

-devfs_vptofh (__unused struct vnode *vp, __unused int *fhlenp, __unused unsigned char *fhp, __unused vfs_context_t context)
+devfs_vptofh (__unused struct vnode *vp, __unused int *fhlenp, __unused unsigned char *fhp, __unused vfs_context_t ctx)

 {
        return (EINVAL);
 }
 {
        return (EINVAL);
 }


@@ -338,7 +466,7 @@ devfs_vptofh (__unused struct vnode *vp, __unused int *fhlenp, __unused unsigned
 static int
 devfs_sysctl(__unused int *name, __unused u_int namelen, __unused user_addr_t oldp, 
              __unused size_t *oldlenp, __unused user_addr_t newp, 
 static int
 devfs_sysctl(__unused int *name, __unused u_int namelen, __unused user_addr_t oldp, 
              __unused size_t *oldlenp, __unused user_addr_t newp, 

-             __unused size_t newlen, __unused vfs_context_t context)
+             __unused size_t newlen, __unused vfs_context_t ctx)

 {
     return (ENOTSUP);
 }
 {
     return (ENOTSUP);
 }


@@ -357,29 +485,32 @@ devfs_kernel_mount(char * mntname)
        int error;
        struct nameidata nd;
        struct vnode  * vp;
        int error;
        struct nameidata nd;
        struct vnode  * vp;

-       struct vfs_context context;
+       vfs_context_t ctx = vfs_context_kernel();
+       struct vfstable *vfsp;

 
 

-       if (devfs_vfsp == NULL) {
-           printf("devfs_kernel_mount: devfs_vfsp is NULL\n");
-           return (EINVAL);
-       }
-       context.vc_proc = current_proc();
-       context.vc_ucred = kauth_cred_get();
+       /* Find our vfstable entry */
+       for (vfsp = vfsconf; vfsp; vfsp = vfsp->vfc_next)
+               if (!strncmp(vfsp->vfc_name, "devfs", sizeof(vfsp->vfc_name)))
+                       break;
+       
+       if (!vfsp) {
+               panic("Could not find entry in vfsconf for devfs.\n");
+       } 

 
        /*
         * Get vnode to be covered
         */
 
        /*
         * Get vnode to be covered
         */

-       NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE32,
-           CAST_USER_ADDR_T(mntname), &context);
+       NDINIT(&nd, LOOKUP, OP_MOUNT, FOLLOW | LOCKLEAF, UIO_SYSSPACE,
+           CAST_USER_ADDR_T(mntname), ctx);

        if ((error = namei(&nd))) {
        if ((error = namei(&nd))) {

-           printf("devfs_kernel_mount: failed to find directory '%s', %d", 
+           printf("devfs_kernel_mount: failed to find directory '%s', %d\n", 

                   mntname, error);
            return (error);
        }
        nameidone(&nd);
        vp = nd.ni_vp;
 
                   mntname, error);
            return (error);
        }
        nameidone(&nd);
        vp = nd.ni_vp;
 

-       if ((error = VNOP_FSYNC(vp, MNT_WAIT, &context))) {
+       if ((error = VNOP_FSYNC(vp, MNT_WAIT, ctx))) {

            printf("devfs_kernel_mount: vnop_fsync failed: %d\n", error);
            vnode_put(vp);
            return (error);
            printf("devfs_kernel_mount: vnop_fsync failed: %d\n", error);
            vnode_put(vp);
            return (error);


@@ -402,13 +533,16 @@ devfs_kernel_mount(char * mntname)
        /*
         * Allocate and initialize the filesystem.
         */
        /*
         * Allocate and initialize the filesystem.
         */

-       MALLOC_ZONE(mp, struct mount *, (u_long)sizeof(struct mount),
+       MALLOC_ZONE(mp, struct mount *, sizeof(struct mount),

                M_MOUNT, M_WAITOK);
                M_MOUNT, M_WAITOK);

-       bzero((char *)mp, (u_long)sizeof(struct mount));
+       bzero((char *)mp, sizeof(struct mount));

 
        /* Initialize the default IO constraints */
        mp->mnt_maxreadcnt = mp->mnt_maxwritecnt = MAXPHYS;
        mp->mnt_segreadcnt = mp->mnt_segwritecnt = 32;
 
        /* Initialize the default IO constraints */
        mp->mnt_maxreadcnt = mp->mnt_maxwritecnt = MAXPHYS;
        mp->mnt_segreadcnt = mp->mnt_segwritecnt = 32;

+       mp->mnt_ioflags = 0;
+       mp->mnt_realrootvp = NULLVP;
+       mp->mnt_authcache_ttl = CACHED_LOOKUP_RIGHT_TTL;

 
        mount_lock_init(mp);
        TAILQ_INIT(&mp->mnt_vnodelist);
 
        mount_lock_init(mp);
        TAILQ_INIT(&mp->mnt_vnodelist);


@@ -416,28 +550,32 @@ devfs_kernel_mount(char * mntname)
        TAILQ_INIT(&mp->mnt_newvnodes);
 
        (void)vfs_busy(mp, LK_NOWAIT);
        TAILQ_INIT(&mp->mnt_newvnodes);
 
        (void)vfs_busy(mp, LK_NOWAIT);

-       mp->mnt_op = devfs_vfsp->vfc_vfsops;
-       mp->mnt_vtable = devfs_vfsp;
-       devfs_vfsp->vfc_refcount++;
-       devfs_vfsp->vfc_threadsafe = TRUE;
-       devfs_vfsp->vfc_64bitready = TRUE;
+       mp->mnt_op = &devfs_vfsops;
+       mp->mnt_vtable = vfsp;

        mp->mnt_flag = 0;
        mp->mnt_flag = 0;

-       mp->mnt_flag |= devfs_vfsp->vfc_flags & MNT_VISFLAGMASK;
-       strncpy(mp->mnt_vfsstat.f_fstypename, devfs_vfsp->vfc_name, MFSTYPENAMELEN);
+       mp->mnt_flag |= vfsp->vfc_flags & MNT_VISFLAGMASK;
+       strlcpy(mp->mnt_vfsstat.f_fstypename, vfsp->vfc_name, MFSTYPENAMELEN);

        vp->v_mountedhere = mp;
        mp->mnt_vnodecovered = vp;
        mp->mnt_vfsstat.f_owner = kauth_cred_getuid(kauth_cred_get());
        (void) copystr(mntname, mp->mnt_vfsstat.f_mntonname, MAXPATHLEN - 1, 0);
        vp->v_mountedhere = mp;
        mp->mnt_vnodecovered = vp;
        mp->mnt_vfsstat.f_owner = kauth_cred_getuid(kauth_cred_get());
        (void) copystr(mntname, mp->mnt_vfsstat.f_mntonname, MAXPATHLEN - 1, 0);

+#if CONFIG_MACF
+       mac_mount_label_init(mp);
+       mac_mount_label_associate(ctx, mp);
+#endif

 
 

-       error = devfs_mount(mp, NULL, NULL, &context);
+       error = devfs_mount(mp, NULL, USER_ADDR_NULL, ctx);

 
        if (error) {
 
        if (error) {

-           printf("devfs_kernel_mount: mount %s failed: %d", mntname, error);
+           printf("devfs_kernel_mount: mount %s failed: %d\n", mntname, error);

            mp->mnt_vtable->vfc_refcount--;
 
            vfs_unbusy(mp);
 
            mount_lock_destroy(mp);
            mp->mnt_vtable->vfc_refcount--;
 
            vfs_unbusy(mp);
 
            mount_lock_destroy(mp);

+#if CONFIG_MACF
+           mac_mount_label_destroy(mp);
+#endif

            FREE_ZONE(mp, sizeof (struct mount), M_MOUNT);
            vnode_put(vp);
            return (error);
            FREE_ZONE(mp, sizeof (struct mount), M_MOUNT);
            vnode_put(vp);
            return (error);


@@ -461,5 +599,7 @@ struct vfsops devfs_vfsops = {
        devfs_fhtovp,
        devfs_vptofh,
        devfs_init,
        devfs_fhtovp,
        devfs_vptofh,
        devfs_init,

-       devfs_sysctl
+       devfs_sysctl,
+       NULL,
+       {NULL}

 };
 };