Commit 097eed10 authored by Al Viro's avatar Al Viro
Browse files

fix the arch checks in MREMAP_FIXED case 



Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarHugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f106af4e

mm/mremap.c

+17 −2
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ static unsigned long mremap_to(unsigned long addr, 
	struct vm_area_struct *vma;

	unsigned long ret = -EINVAL;

	unsigned long charged = 0;

	unsigned long map_flags;



	if (new_addr & ~PAGE_MASK)

		goto out;
@@ -362,8 +363,22 @@ static unsigned long mremap_to(unsigned long addr, 
		goto out;

	}



	ret = move_vma(vma, addr, old_len, new_len, new_addr);

	map_flags = MAP_FIXED;

	if (vma->vm_flags & VM_MAYSHARE)

		map_flags |= MAP_SHARED;

	ret = arch_mmap_check(new_addr, new_len, map_flags);

	if (ret)

		goto out1;

	ret = get_unmapped_area(vma->vm_file, new_addr, new_len, vma->vm_pgoff +

				((addr - vma->vm_start) >> PAGE_SHIFT),

				map_flags);

	if (ret & ~PAGE_MASK)

		goto out1;



	ret = move_vma(vma, addr, old_len, new_len, new_addr);

	if (!(ret & ~PAGE_MASK))

		goto out;

out1:

	vm_unacct_memory(charged);



out: