diff options
| author | Cyrill Gorcunov <gorcunov@openvz.org> | 2014-10-09 18:27:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 22:25:55 -0400 |
| commit | 8764b338b37524ab1a78aee527318ebee9762487 (patch) | |
| tree | 2f4a777fb6728331f0da3bb6d759cd27bf16454f /mm | |
| parent | 9c5990240e076ae564cccbd921868cd08f6daaa5 (diff) | |
mm: use may_adjust_brk helper
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Andrew Vagin <avagin@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Vasiliy Kulikov <segoon@openwall.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Julien Tinnes <jln@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 7 |
1 files changed, 3 insertions, 4 deletions
| @@ -268,7 +268,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len); | |||
| 268 | 268 | ||
| 269 | SYSCALL_DEFINE1(brk, unsigned long, brk) | 269 | SYSCALL_DEFINE1(brk, unsigned long, brk) |
| 270 | { | 270 | { |
| 271 | unsigned long rlim, retval; | 271 | unsigned long retval; |
| 272 | unsigned long newbrk, oldbrk; | 272 | unsigned long newbrk, oldbrk; |
| 273 | struct mm_struct *mm = current->mm; | 273 | struct mm_struct *mm = current->mm; |
| 274 | unsigned long min_brk; | 274 | unsigned long min_brk; |
| @@ -298,9 +298,8 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) | |||
| 298 | * segment grow beyond its set limit the in case where the limit is | 298 | * segment grow beyond its set limit the in case where the limit is |
| 299 | * not page aligned -Ram Gupta | 299 | * not page aligned -Ram Gupta |
| 300 | */ | 300 | */ |
| 301 | rlim = rlimit(RLIMIT_DATA); | 301 | if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk, |
| 302 | if (rlim < RLIM_INFINITY && (brk - mm->start_brk) + | 302 | mm->end_data, mm->start_data)) |
| 303 | (mm->end_data - mm->start_data) > rlim) | ||
| 304 | goto out; | 303 | goto out; |
| 305 | 304 | ||
| 306 | newbrk = PAGE_ALIGN(brk); | 305 | newbrk = PAGE_ALIGN(brk); |