xnu-2050.7.9.tar.gz

[apple/xnu.git] / bsd / vfs / vfs_vnops.c

diff --git a/bsd/vfs/vfs_vnops.c b/bsd/vfs/vfs_vnops.c
index d7e2b5f1488a6bc89ef1416c23cde2d4b786b0b7..47552a0d8e0a33eb23083bcee7560767b6e26a5b 100644 (file)
--- a/bsd/vfs/vfs_vnops.c
+++ b/bsd/vfs/vfs_vnops.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.

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


@@ -111,6 +111,10 @@ int        ubc_setcred(struct vnode *, struct proc *);
 #include <security/mac_framework.h>
 #endif
 
 #include <security/mac_framework.h>
 #endif
 

+#if CONFIG_PROTECT
+#include <sys/cprotect.h>
+#endif
+

 
 static int vn_closefile(struct fileglob *fp, vfs_context_t ctx);
 static int vn_ioctl(struct fileproc *fp, u_long com, caddr_t data,
 
 static int vn_closefile(struct fileglob *fp, vfs_context_t ctx);
 static int vn_ioctl(struct fileproc *fp, u_long com, caddr_t data,


@@ -445,7 +449,8 @@ continue_create_lookup:
                        }
 
                        need_vnop_open = !did_open;
                        }
 
                        need_vnop_open = !did_open;

-               } else {
+               } 
+               else {

                        if (fmode & O_EXCL)
                                error = EEXIST;
 
                        if (fmode & O_EXCL)
                                error = EEXIST;
 


@@ -555,6 +560,25 @@ continue_create_lookup:
                        }
                }
 
                        }
                }
 

+#if CONFIG_PROTECT
+               /* 
+                * Perform any content protection access checks prior to calling 
+                * into the filesystem, if the raw encrypted mode was not 
+                * requested.  
+                * 
+                * If the va_dataprotect_flags are NOT active, or if they are,
+                * but they do not have the VA_DP_RAWENCRYPTED bit set, then we need 
+                * to perform the checks.
+                */
+               if (!(VATTR_IS_ACTIVE (vap, va_dataprotect_flags)) ||
+                               ((vap->va_dataprotect_flags & VA_DP_RAWENCRYPTED) == 0)) {
+                       error = cp_handle_open (vp, fmode);     
+                       if (error) {
+                               goto bad;
+                       }
+               }
+#endif
+

                error = VNOP_OPEN(vp, fmode, ctx);
                if (error) {
                        goto bad;
                error = VNOP_OPEN(vp, fmode, ctx);
                if (error) {
                        goto bad;


@@ -877,13 +901,18 @@ vn_read(struct fileproc *fp, struct uio *uio, int flags, vfs_context_t ctx)
        }
 #endif
 
        }
 #endif
 

-       ioflag = 0;
+       /* This signals to VNOP handlers that this read came from a file table read */
+       ioflag = IO_SYSCALL_DISPATCH;
+

        if (fp->f_fglob->fg_flag & FNONBLOCK)
                ioflag |= IO_NDELAY;
        if ((fp->f_fglob->fg_flag & FNOCACHE) || vnode_isnocache(vp))
        if (fp->f_fglob->fg_flag & FNONBLOCK)
                ioflag |= IO_NDELAY;
        if ((fp->f_fglob->fg_flag & FNOCACHE) || vnode_isnocache(vp))

-               ioflag |= IO_NOCACHE;
+           ioflag |= IO_NOCACHE;
+       if (fp->f_fglob->fg_flag & FENCRYPTED) {
+               ioflag |= IO_ENCRYPTED;
+       }

        if (fp->f_fglob->fg_flag & FNORDAHEAD)
        if (fp->f_fglob->fg_flag & FNORDAHEAD)

-               ioflag |= IO_RAOFF;
+           ioflag |= IO_RAOFF;

 
        if ((flags & FOF_OFFSET) == 0)
                uio->uio_offset = fp->f_fglob->fg_offset;
 
        if ((flags & FOF_OFFSET) == 0)
                uio->uio_offset = fp->f_fglob->fg_offset;


@@ -931,7 +960,12 @@ vn_write(struct fileproc *fp, struct uio *uio, int flags, vfs_context_t ctx)
        }
 #endif
 
        }
 #endif
 

-       ioflag = IO_UNIT;
+       /* 
+        * IO_SYSCALL_DISPATCH signals to VNOP handlers that this write originated 
+        * from a file table write.
+        */
+       ioflag = (IO_UNIT | IO_SYSCALL_DISPATCH);
+

        if (vp->v_type == VREG && (fp->f_fglob->fg_flag & O_APPEND))
                ioflag |= IO_APPEND;
        if (fp->f_fglob->fg_flag & FNONBLOCK)
        if (vp->v_type == VREG && (fp->f_fglob->fg_flag & O_APPEND))
                ioflag |= IO_APPEND;
        if (fp->f_fglob->fg_flag & FNONBLOCK)


@@ -940,6 +974,8 @@ vn_write(struct fileproc *fp, struct uio *uio, int flags, vfs_context_t ctx)
                ioflag |= IO_NOCACHE;
        if (fp->f_fglob->fg_flag & FNODIRECT)
                ioflag |= IO_NODIRECT;
                ioflag |= IO_NOCACHE;
        if (fp->f_fglob->fg_flag & FNODIRECT)
                ioflag |= IO_NODIRECT;

+       if (fp->f_fglob->fg_flag & FSINGLE_WRITER)
+               ioflag |= IO_SINGLE_WRITER;

 
        /*
         * Treat synchronous mounts and O_FSYNC on the fd as equivalent.
 
        /*
         * Treat synchronous mounts and O_FSYNC on the fd as equivalent.


@@ -1289,14 +1325,14 @@ vn_ioctl(struct fileproc *fp, u_long com, caddr_t data, vfs_context_t ctx)
                                        error = ENXIO;
                                        goto out;
                                }
                                        error = ENXIO;
                                        goto out;
                                }

-                               *(int *)data = bdevsw[major(vp->v_rdev)].d_type;
+                               *(int *)data = D_TYPEMASK & bdevsw[major(vp->v_rdev)].d_type;

 
                        } else if (vp->v_type == VCHR) {
                                if (major(vp->v_rdev) >= nchrdev) {
                                        error = ENXIO;
                                        goto out;
                                }
 
                        } else if (vp->v_type == VCHR) {
                                if (major(vp->v_rdev) >= nchrdev) {
                                        error = ENXIO;
                                        goto out;
                                }

-                               *(int *)data = cdevsw[major(vp->v_rdev)].d_type;
+                               *(int *)data = D_TYPEMASK & cdevsw[major(vp->v_rdev)].d_type;

                        } else {
                                error = ENOTTY;
                                goto out;
                        } else {
                                error = ENOTTY;
                                goto out;