From: Al Viro Date: Fri, 4 Dec 2009 00:40:46 +0000 (-0500) Subject: switch do_brk() to get_unmapped_area() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2c6a10161d0b5fc047b5bd81b03693b9af99fab5;p=openwrt%2Fstaging%2Fblogic.git switch do_brk() to get_unmapped_area() Signed-off-by: Al Viro --- 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; /*