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 e598cdf67c520bef293914a84e3542614e502b4c..61f0d692994acbd0211779d6455621056fdd862f 100644 (file)
--- a/bsd/dev/i386/mem.c
+++ b/bsd/dev/i386/mem.c
@@ -88,7 +88,9 @@
 
 extern addr64_t  kvtophys(vm_offset_t va); 
 extern boolean_t kernacc(off_t, size_t );
 
 extern addr64_t  kvtophys(vm_offset_t va); 
 extern boolean_t kernacc(off_t, size_t );

+#if !defined(SECURE_KERNEL)

 extern int setup_kmem;
 extern int setup_kmem;

+#endif

 
 static caddr_t devzerobuf;
 
 
 static caddr_t devzerobuf;
 


@@ -117,8 +119,15 @@ mmioctl(dev_t dev, u_long cmd, __unused caddr_t data,
 {
        int minnum = minor(dev);
 
 {
        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:
 
        switch (cmd) {
        case FIONBIO:


@@ -149,8 +158,12 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
 
                /* minor device 0 is physical memory */
                case 0:
 
                /* minor device 0 is physical memory */
                case 0:

+#if defined(SECURE_KERNEL)
+                       return(ENODEV);
+#else

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

+#endif

 
                        v = trunc_page(uio->uio_offset);
                        if (uio->uio_offset >= (off_t)mem_size)
 
                        v = trunc_page(uio->uio_offset);
                        if (uio->uio_offset >= (off_t)mem_size)


@@ -169,8 +182,12 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
 
                /* minor device 1 is kernel memory */
                case 1:
 
                /* minor device 1 is kernel memory */
                case 1:

+#if defined(SECURE_KERNEL)
+                       return(ENODEV);
+#else

                        if (setup_kmem == 0)
                                return(ENODEV);
                        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_AND_KEXT_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_AND_KEXT_ADDRESS))