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 40892578bf4b5917bb5999ddbcb408e086820b95..012d4117ff5dfab31884cd8e9c42df5e7aacb02f 100644 (file)
--- a/osfmk/i386/io_map.c
+++ b/osfmk/i386/io_map.c
@@ -61,6 +61,7 @@
 #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;
 
@@ -69,7 +70,7 @@ extern vm_offset_t    virtual_avail;
  * Mach VM is running.
  */
 vm_offset_t
-io_map(vm_offset_t phys_addr, vm_size_t size, unsigned int flags)
+io_map(vm_map_offset_t phys_addr, vm_size_t size, unsigned int flags)
 {
        vm_offset_t     start;
 
@@ -80,12 +81,15 @@ io_map(vm_offset_t phys_addr, vm_size_t size, unsigned int flags)
            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),
                               VM_PROT_READ|VM_PROT_WRITE,
                               flags);
        }
        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),
                            VM_PROT_READ|VM_PROT_WRITE,
                            flags);
@@ -95,7 +99,7 @@ io_map(vm_offset_t phys_addr, vm_size_t size, unsigned int flags)
 
 /* just wrap this since io_map handles it */
 
-vm_offset_t io_map_spec(vm_offset_t phys_addr, vm_size_t size, unsigned int flags)
+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, flags));
 }