mmap randomization for executable mappings on 32-bit

[linux-flexiantxendom0-natty.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 1de98d4..cb6a8cb 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -488,10 +488,10 @@ unsigned long do_mremap(unsigned long addr,
                if (vma->vm_flags & VM_MAYSHARE)
                        map_flags |= MAP_SHARED;
 
-               new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
+               new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len,
                                        vma->vm_pgoff +
                                        ((addr - vma->vm_start) >> PAGE_SHIFT),
-                                       map_flags);
+                                       map_flags, vma->vm_flags & VM_EXEC);
                if (new_addr & ~PAGE_MASK) {
                        ret = new_addr;
                        goto out;