xnu-1504.7.4.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 ee9be2dbacd36e048bbff09007c9b85f7a32eb4e..e598cdf67c520bef293914a84e3542614e502b4c 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/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>
 #include <sys/vm.h>
 #include <sys/uio_internal.h>
 #include <sys/malloc.h>


@@ -85,8 +86,9 @@
 #include <mach/vm_param.h>
 #include <vm/vm_kern.h>                /* for kernel_map */
 
 #include <mach/vm_param.h>
 #include <vm/vm_kern.h>                /* for kernel_map */
 

-extern vm_offset_t kvtophys(vm_offset_t va); 
+extern addr64_t  kvtophys(vm_offset_t va); 

 extern boolean_t kernacc(off_t, size_t );
 extern boolean_t kernacc(off_t, size_t );

+extern int setup_kmem;

 
 static caddr_t devzerobuf;
 
 
 static caddr_t devzerobuf;
 


@@ -110,9 +112,14 @@ mmwrite(dev_t dev, struct uio *uio)
 }
 
 int
 }
 
 int

-mmioctl(__unused dev_t dev, u_long cmd, __unused caddr_t data, 
+mmioctl(dev_t dev, u_long cmd, __unused caddr_t data, 

                __unused int flag, __unused struct proc *p)
 {
                __unused int flag, __unused struct proc *p)
 {

+       int minnum = minor(dev);
+
+       if ((setup_kmem == 0) && ((minnum == 0) || (minnum == 1)))
+               return(EINVAL);
+

        switch (cmd) {
        case FIONBIO:
        case FIOASYNC:
        switch (cmd) {
        case FIONBIO:
        case FIOASYNC:


@@ -134,20 +141,19 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
        vm_offset_t     where;
        vm_size_t size;
 
        vm_offset_t     where;
        vm_size_t size;
 

+

        while (uio_resid(uio) > 0 && error == 0) {
        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:
                switch (minor(dev)) {
 
                /* minor device 0 is physical memory */
                case 0:

+                       if (setup_kmem == 0)
+                               return(ENODEV);
+

                        v = trunc_page(uio->uio_offset);
                        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;
                                goto fault;
 
                        size= PAGE_SIZE;


@@ -156,19 +162,20 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                                goto fault;
                        }
                        o = uio->uio_offset - v;
                                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:
                        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 (setup_kmem == 0)
+                               return(ENODEV);

                        /* Do some sanity checking */
                        if (((vm_address_t)uio->uio_offset >= VM_MAX_KERNEL_ADDRESS) ||
                        /* 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;
                                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,
                        if (!kernacc(uio->uio_offset, c))
                                goto fault;
                        error = uiomove((caddr_t)(uintptr_t)uio->uio_offset,


@@ -179,7 +186,7 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                case 2:
                        if (rw == UIO_READ)
                                return (0);
                case 2:
                        if (rw == UIO_READ)
                                return (0);

-                       c = uio_iov_len(uio);
+                       c = uio_curriovlen(uio);

                        break;
                case 3:
                        if(devzerobuf == NULL) {
                        break;
                case 3:
                        if(devzerobuf == NULL) {


@@ -187,11 +194,10 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                                bzero(devzerobuf, PAGE_SIZE);
                        }
                        if(uio->uio_rw == UIO_WRITE) {
                                bzero(devzerobuf, PAGE_SIZE);
                        }
                        if(uio->uio_rw == UIO_WRITE) {

-                               c = uio_iov_len(uio);
+                               c = uio_curriovlen(uio);

                                break;
                        }
                                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:
                        error = uiomove(devzerobuf, (int)c, uio);
                        continue;
                default:


@@ -201,10 +207,7 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                        
                if (error)
                        break;
                        
                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:
        }
        return (error);
 fault: