diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-03 19:40:46 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-11 06:44:58 -0500 |
| commit | 2c6a10161d0b5fc047b5bd81b03693b9af99fab5 (patch) | |
| tree | 298916728f640d1ae156a6dfc855b1c8f6c46e37 /mm | |
| parent | 9206de95b1ea68357996ec02be5db0638a0de2c1 (diff) | |
| download | linux-stable-2c6a10161d0b5fc047b5bd81b03693b9af99fab5.tar.gz linux-stable-2c6a10161d0b5fc047b5bd81b03693b9af99fab5.tar.bz2 linux-stable-2c6a10161d0b5fc047b5bd81b03693b9af99fab5.zip | |
switch do_brk() to get_unmapped_area()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index c04146da8efd..ed70a68e882a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1985,20 +1985,14 @@ unsigned long do_brk(unsigned long addr, unsigned long len) if (!len) return addr; - if ((addr + len) > TASK_SIZE || (addr + len) < addr) - return -EINVAL; - - if (is_hugepage_only_range(mm, addr, len)) - return -EINVAL; - error = security_file_mmap(NULL, 0, 0, 0, addr, 1); if (error) return error; flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; - error = arch_mmap_check(addr, len, flags); - if (error) + error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED); + if (error & ~PAGE_MASK) return error; /* |