xnu-4570.20.62.tar.gz

[apple/xnu.git] / osfmk / i386 / io_map.c

diff --git a/osfmk/i386/io_map.c b/osfmk/i386/io_map.c
index 2a9ae6ddffafa20f390432956c71761e8145985e..012d4117ff5dfab31884cd8e9c42df5e7aacb02f 100644 (file)
--- a/osfmk/i386/io_map.c
+++ b/osfmk/i386/io_map.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -55,6 +61,7 @@
 #include <vm/vm_map.h>
 #include <i386/pmap.h>
 #include <i386/io_map_entries.h>
 #include <vm/vm_map.h>
 #include <i386/pmap.h>
 #include <i386/io_map_entries.h>

+#include <san/kasan.h>

 
 extern vm_offset_t     virtual_avail;
 
 
 extern vm_offset_t     virtual_avail;
 


@@ -63,9 +70,7 @@ extern vm_offset_t    virtual_avail;
  * Mach VM is running.
  */
 vm_offset_t
  * Mach VM is running.
  */
 vm_offset_t

-io_map(phys_addr, size)
-       vm_offset_t     phys_addr;
-       vm_size_t       size;
+io_map(vm_map_offset_t phys_addr, vm_size_t size, unsigned int flags)

 {
        vm_offset_t     start;
 
 {
        vm_offset_t     start;
 


@@ -76,20 +81,25 @@ io_map(phys_addr, size)
            start = virtual_avail;
            virtual_avail += round_page(size);
 
            start = virtual_avail;
            virtual_avail += round_page(size);
 

+#if KASAN
+           kasan_notify_address(start, size);
+#endif

            (void) pmap_map_bd(start, phys_addr, phys_addr + round_page(size),
            (void) pmap_map_bd(start, phys_addr, phys_addr + round_page(size),

-                              VM_PROT_READ|VM_PROT_WRITE);
+                              VM_PROT_READ|VM_PROT_WRITE,
+                              flags);

        }
        else {
        }
        else {

-           (void) kmem_alloc_pageable(kernel_map, &start, round_page(size));
+           (void) kmem_alloc_pageable(kernel_map, &start, round_page(size), VM_KERN_MEMORY_IOKIT);

            (void) pmap_map(start, phys_addr, phys_addr + round_page(size),
            (void) pmap_map(start, phys_addr, phys_addr + round_page(size),

-                           VM_PROT_READ|VM_PROT_WRITE);
+                           VM_PROT_READ|VM_PROT_WRITE,
+                           flags);

        }
        return (start);
 }
 
 /* just wrap this since io_map handles it */
 
        }
        return (start);
 }
 
 /* just wrap this since io_map handles it */
 

-vm_offset_t io_map_spec(vm_offset_t phys_addr, vm_size_t size)
+vm_offset_t io_map_spec(vm_map_offset_t phys_addr, vm_size_t size, unsigned int flags)

 {
 {

-  return (io_map(phys_addr, size));
+  return (io_map(phys_addr, size, flags));

 }
 }