Merge tag 'integrity-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...

[linux-2.6-microblaze.git] / mm / ioremap.c

diff --git a/mm/ioremap.c b/mm/ioremap.c
index 2d754b4..8652426 100644 (file)
--- a/mm/ioremap.c
+++ b/mm/ioremap.c
@@ -28,11 +28,15 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
        phys_addr -= offset;
        size = PAGE_ALIGN(size + offset);
 
+       if (!ioremap_allowed(phys_addr, size, prot))
+               return NULL;
+
        area = get_vm_area_caller(size, VM_IOREMAP,
                        __builtin_return_address(0));
        if (!area)
                return NULL;
        vaddr = (unsigned long)area->addr;
+       area->phys_addr = phys_addr;
 
        if (ioremap_page_range(vaddr, vaddr + size, phys_addr,
                               __pgprot(prot))) {
@@ -46,6 +50,12 @@ EXPORT_SYMBOL(ioremap_prot);
 
 void iounmap(volatile void __iomem *addr)
 {
-       vunmap((void *)((unsigned long)addr & PAGE_MASK));
+       void *vaddr = (void *)((unsigned long)addr & PAGE_MASK);
+
+       if (!iounmap_allowed(vaddr))
+               return;
+
+       if (is_vmalloc_addr(vaddr))
+               vunmap(vaddr);
 }
 EXPORT_SYMBOL(iounmap);