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 | |
parent | 9206de95b1ea68357996ec02be5db0638a0de2c1 (diff) |
switch do_brk() to get_unmapped_area()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | mm/mmap.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -1985,20 +1985,14 @@ unsigned long do_brk(unsigned long addr, unsigned long len) | |||
1985 | if (!len) | 1985 | if (!len) |
1986 | return addr; | 1986 | return addr; |
1987 | 1987 | ||
1988 | if ((addr + len) > TASK_SIZE || (addr + len) < addr) | ||
1989 | return -EINVAL; | ||
1990 | |||
1991 | if (is_hugepage_only_range(mm, addr, len)) | ||
1992 | return -EINVAL; | ||
1993 | |||
1994 | error = security_file_mmap(NULL, 0, 0, 0, addr, 1); | 1988 | error = security_file_mmap(NULL, 0, 0, 0, addr, 1); |
1995 | if (error) | 1989 | if (error) |
1996 | return error; | 1990 | return error; |
1997 | 1991 | ||
1998 | flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; | 1992 | flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; |
1999 | 1993 | ||
2000 | error = arch_mmap_check(addr, len, flags); | 1994 | error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED); |
2001 | if (error) | 1995 | if (error & ~PAGE_MASK) |
2002 | return error; | 1996 | return error; |
2003 | 1997 | ||
2004 | /* | 1998 | /* |