usercopy: Handle vm_map_ram() areas

[sfrench/cifs-2.6.git] / mm / usercopy.c

diff --git a/mm/usercopy.c b/mm/usercopy.c
index baeacc735b83f98cab991cbdc1fdecd9d213fcd9..cd4b41d9bf76007f4aca9ad5a618a5f1956f026b 100644 (file)
--- a/mm/usercopy.c
+++ b/mm/usercopy.c
@@ -173,16 +173,14 @@ static inline void check_heap_object(const void *ptr, unsigned long n,
        }
 
        if (is_vmalloc_addr(ptr)) {
-               struct vm_struct *area = find_vm_area(ptr);
+               struct vmap_area *area = find_vmap_area((unsigned long)ptr);
                unsigned long offset;
 
-               if (!area) {
+               if (!area)
                        usercopy_abort("vmalloc", "no area", to_user, 0, n);
-                       return;
-               }
 
-               offset = ptr - area->addr;
-               if (offset + n > get_vm_area_size(area))
+               offset = (unsigned long)ptr - area->va_start;
+               if ((unsigned long)ptr + n > area->va_end)
                        usercopy_abort("vmalloc", NULL, to_user, offset, n);
                return;
        }