lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix the arch checks in MREMAP_FIXED case

Browse Source 
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2009-11-24 08:43:52 -05:00
parent f106af4e90
commit 097eed1038
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mm/mremap.c
View File

@@ -325,6 +325,7 @@ static unsigned long mremap_to(unsigned long addr,
struct vm_area_struct *vma; struct vm_area_struct *vma;
unsigned long ret = -EINVAL; unsigned long ret = -EINVAL;
unsigned long charged = 0; unsigned long charged = 0;
unsigned long map_flags;
if (new_addr & ~PAGE_MASK) if (new_addr & ~PAGE_MASK)
goto out; goto out;
@@ -362,8 +363,22 @@ static unsigned long mremap_to(unsigned long addr,
goto out; 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) 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); vm_unacct_memory(charged);
out: out: