xnu-2050.24.15.tar.gz

[apple/xnu.git] / bsd / dev / i386 / mem.c

diff --git a/bsd/dev/i386/mem.c b/bsd/dev/i386/mem.c
index 9f4eedddeb4c95932947fc845f9f1639a2188a2f..61f0d692994acbd0211779d6455621056fdd862f 100644 (file)
--- a/bsd/dev/i386/mem.c
+++ b/bsd/dev/i386/mem.c
@@ -77,6 +77,7 @@
 #include <sys/dir.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/conf.h>
 #include <sys/vm.h>
 #include <sys/uio_internal.h>
 #include <sys/malloc.h>
@@ -87,7 +88,9 @@
 
 extern addr64_t  kvtophys(vm_offset_t va); 
 extern boolean_t kernacc(off_t, size_t );
+#if !defined(SECURE_KERNEL)
 extern int setup_kmem;
+#endif
 
 static caddr_t devzerobuf;
 
@@ -116,8 +119,15 @@ mmioctl(dev_t dev, u_long cmd, __unused caddr_t data,
 {
        int minnum = minor(dev);
 
-       if ((setup_kmem == 0) && ((minnum == 0) || (minnum == 1)))
-               return(EINVAL);
+       if (0 == minnum || 1 == minnum) {
+               /* /dev/mem and /dev/kmem */
+#if defined(SECURE_KERNEL)
+               return (ENODEV);
+#else
+               if (0 == setup_kmem) 
+                       return (EINVAL);
+#endif
+       }
 
        switch (cmd) {
        case FIONBIO:
@@ -142,22 +152,21 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
 
 
        while (uio_resid(uio) > 0 && error == 0) {
-               if (uio_iov_len(uio) == 0) {
-                       uio_next_iov(uio);
-                       uio->uio_iovcnt--;
-                       if (uio->uio_iovcnt < 0)
-                               panic("mmrw");
-                       continue;
-               }
+               uio_update(uio, 0);
+
                switch (minor(dev)) {
 
                /* minor device 0 is physical memory */
                case 0:
+#if defined(SECURE_KERNEL)
+                       return(ENODEV);
+#else
                        if (setup_kmem == 0)
                                return(ENODEV);
+#endif
 
                        v = trunc_page(uio->uio_offset);
-                       if (uio->uio_offset >= mem_size)
+                       if (uio->uio_offset >= (off_t)mem_size)
                                goto fault;
 
                        size= PAGE_SIZE;
@@ -166,21 +175,24 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                                goto fault;
                        }
                        o = uio->uio_offset - v;
-                       // LP64todo - fix this!
-                       c = min(PAGE_SIZE - o, (u_int)uio_iov_len(uio));
+                       c = min(PAGE_SIZE - o, uio_curriovlen(uio));
                        error = uiomove((caddr_t) (where + o), c, uio);
                        kmem_free(kernel_map, where, PAGE_SIZE);
                        continue;
 
                /* minor device 1 is kernel memory */
                case 1:
+#if defined(SECURE_KERNEL)
+                       return(ENODEV);
+#else
                        if (setup_kmem == 0)
                                return(ENODEV);
+#endif
                        /* Do some sanity checking */
                        if (((vm_address_t)uio->uio_offset >= VM_MAX_KERNEL_ADDRESS) ||
-                               ((vm_address_t)uio->uio_offset <= VM_MIN_KERNEL_ADDRESS))
+                               ((vm_address_t)uio->uio_offset <= VM_MIN_KERNEL_AND_KEXT_ADDRESS))
                                goto fault;
-                       c = uio_iov_len(uio);
+                       c = uio_curriovlen(uio);
                        if (!kernacc(uio->uio_offset, c))
                                goto fault;
                        error = uiomove((caddr_t)(uintptr_t)uio->uio_offset,
@@ -191,7 +203,7 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                case 2:
                        if (rw == UIO_READ)
                                return (0);
-                       c = uio_iov_len(uio);
+                       c = uio_curriovlen(uio);
                        break;
                case 3:
                        if(devzerobuf == NULL) {
@@ -199,11 +211,10 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                                bzero(devzerobuf, PAGE_SIZE);
                        }
                        if(uio->uio_rw == UIO_WRITE) {
-                               c = uio_iov_len(uio);
+                               c = uio_curriovlen(uio);
                                break;
                        }
-                       // LP64todo - fix this!
-                       c = min(uio_iov_len(uio), PAGE_SIZE);
+                       c = min(uio_curriovlen(uio), PAGE_SIZE);
                        error = uiomove(devzerobuf, (int)c, uio);
                        continue;
                default:
@@ -213,10 +224,7 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                        
                if (error)
                        break;
-               uio_iov_base_add(uio, c);
-               uio_iov_len_add(uio, -((int)c));
-               uio->uio_offset += c;
-               uio_setresid(uio, (uio_resid(uio) - c));
+               uio_update(uio, c);
        }
        return (error);
 fault: